LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix SDK repo to prevent mixing different targets.

Browse Source 
This makes sure that sdk-repo-*.zip doesn't exist to
avoid merging into an existing one.

Also fix a warning when generating the repo.xml files.

(cherry picked from commit 4df9f469f7)

Change-Id: Ifeb1234cacf121458bda9d869d7e5df5b5a19673
This commit is contained in:
Raphael Moll
2014-06-02 17:11:45 -07:00
committed by Raphael Moll
parent 1669109705
commit 14023aeef1
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/tools/mk_sdk_repo_xml.sh
View File

@@ -267,7 +267,7 @@ function parse_attributes() {
REV="${BASH_REMATCH[2]}" REV="${BASH_REMATCH[2]}"
fi fi
if [[ $XSD_VERSION -ge $REV ]]; then if [[ ( $REV =~ ^[0-9]+ && $XSD_VERSION -ge $REV ) || $XSD_VERSION == $REV ]]; then
# Parse the property, if present. Any space is replaced by @ # Parse the property, if present. Any space is replaced by @
VALUE=$( grep "^$SRC=" "$PROPS" | cut -d = -f 2 | tr ' ' '@' | tr -d '\r' ) VALUE=$( grep "^$SRC=" "$PROPS" | cut -d = -f 2 | tr ' ' '@' | tr -d '\r' )
if [[ -n "$VALUE" ]]; then if [[ -n "$VALUE" ]]; then

3
build/tools/sdk_repo.mk
View File

@@ -32,6 +32,7 @@ define mk-sdk-repo-pkg-1
$(call sdk-repo-pkg-zip,$(2),$(3),$(4)): $(3) $(call sdk-repo-pkg-zip,$(2),$(3),$(4)): $(3)
@echo "Building SDK repository package $(4) from $(notdir $(3))" @echo "Building SDK repository package $(4) from $(notdir $(3))"
$(hide) cd $(basename $(3)) && \ $(hide) cd $(basename $(3)) && \
rm -f ../$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) && \
zip -9rq ../$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) $(4)/* zip -9rq ../$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) $(4)/*
$(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) $(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(2),$(3),$(4)))
$(1) += $(4) $(2) \ $(1) += $(4) $(2) \
@@ -54,6 +55,7 @@ define mk-sdk-repo-pkg-2
$(call sdk-repo-pkg-zip,$(2),$(3),$(4)): $(3) $(call sdk-repo-pkg-zip,$(2),$(3),$(4)): $(3)
@echo "Building SDK repository package $(4) from $(notdir $(3))" @echo "Building SDK repository package $(4) from $(notdir $(3))"
$(hide) cd $(basename $(3))/$(4) && \ $(hide) cd $(basename $(3))/$(4) && \
rm -f ../../$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) && \
zip -9rq ../../$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) * zip -9rq ../../$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) *
$(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) $(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(2),$(3),$(4)))
$(1) += $(4) $(2) \ $(1) += $(4) $(2) \
@@ -80,6 +82,7 @@ define mk-sdk-repo-pkg-3
$(call sdk-repo-pkg-zip,$(2),$(3),$(4)): $(3) $(call sdk-repo-pkg-zip,$(2),$(3),$(4)): $(3)
@echo "Building SDK repository package $(4) from $(notdir $(3))" @echo "Building SDK repository package $(4) from $(notdir $(3))"
$(hide) cd $(basename $(3))/$(5) && \ $(hide) cd $(basename $(3))/$(5) && \
rm -f ../../../$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) && \
zip -9rq ../../../$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) * zip -9rq ../../../$(notdir $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) *
$(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(2),$(3),$(4))) $(call dist-for-goals, sdk_repo, $(call sdk-repo-pkg-zip,$(2),$(3),$(4)))
$(1) += $(4) $(2) \ $(1) += $(4) $(2) \