summaryrefslogtreecommitdiffstats
path: root/build/tools/sdk_repo.mk
diff options
context:
space:
mode:
authorRaphael Moll <raphael@google.com>2014-08-21 15:15:02 -0700
committerRaphael Moll <raphael@google.com>2014-08-21 16:00:12 -0700
commitfa090e240f319e8c7afdfd705f928f9504c95d09 (patch)
tree4f38b6c3e5758b8c48cf554b6ee44f60c7d110da /build/tools/sdk_repo.mk
parentd6a790cdfef3aa0c16264c6a2c37e0164dde8d04 (diff)
downloadandroid_development-fa090e240f319e8c7afdfd705f928f9504c95d09.tar.gz
android_development-fa090e240f319e8c7afdfd705f928f9504c95d09.tar.bz2
android_development-fa090e240f319e8c7afdfd705f928f9504c95d09.zip
SDK Addon multi-sys-img support, part 2.
Change the sdk_repo rule to generate a system-image zip package and its corresponding XML for the addon. Change-Id: I3c2318d2085362f62784415713b44cc8fe97ea9c
Diffstat (limited to 'build/tools/sdk_repo.mk')
-rw-r--r--build/tools/sdk_repo.mk20
1 files changed, 20 insertions, 0 deletions
diff --git a/build/tools/sdk_repo.mk b/build/tools/sdk_repo.mk
index 8d13d7073..db8808a3b 100644
--- a/build/tools/sdk_repo.mk
+++ b/build/tools/sdk_repo.mk
@@ -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