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

Merge "SDK Addon multi-sys-img support, part 2." into lmp-dev

Browse Source
This commit is contained in:
Raphael Moll
2014-09-11 22:28:56 +00:00
committed by Android (Google) Code Review
parent 2326f11a21 fa090e240f
commit 130967f3d3
2 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/tools/mk_sdk_repo_xml.sh
View File

@@ -122,6 +122,8 @@ ATTRS=(
SystemImage.Abi abi r:3,s:1
SystemImage.TagId tag-id r:9,s:2
SystemImage.TagDisplay tag-display r:9,s:2
Addon.VendorId add-on/vendor-id s:3
Addon.VendorDisplay add-on/vendor-display s:3
# from addon manifest.ini for addon.xml packages
# (note that vendor/name are mapped to different XML elements based on the XSD version)
vendor-id vendor-id 4

20
build/tools/sdk_repo.mk
View File

@@ -205,6 +205,26 @@ $(call dist-for-goals, sdk_repo, $(SDK_ADDON_XML))
endif
ifneq ($(ADDON_SDK_IMG_ZIP),)
# Copy/rename the ADDON_SDK_IMG_ZIP file as an sdk-repo zip in the dist dir
RENAMED_ADDON_IMG_ZIP := $(ADDON_SDK_IMG_ZIP):$(notdir $(call sdk-repo-pkg-zip,$(HOST_OS),$(ADDON_SDK_IMG_ZIP),system-images))
$(call dist-for-goals, sdk_repo, $(RENAMED_ADDON_IMG_ZIP))
# Generate the system-image XML for the addon sys-img
SDK_ADDON_IMG_XML := $(dir $(ADDON_SDK_ZIP))/addon-sys-img.xml
$(SDK_ADDON_IMG_XML): $(ADDON_SDK_IMG_ZIP)
$(hide) $(TOPDIR)development/build/tools/mk_sdk_repo_xml.sh \
$(SDK_ADDON_IMG_XML) $(SDK_SYSIMG_XSD) system-image $(HOST_OS) $(RENAMED_ADDON_IMG_ZIP)
$(call dist-for-goals, sdk_repo, $(SDK_ADDON_IMG_XML))
endif
# -----------------------------------------------------------------
# Rules for the SDK Repository XML