summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorbohu <bohu@google.com>2015-06-01 17:25:11 -0700
committerbohu <bohu@google.com>2015-06-01 17:35:50 -0700
commit52e0bf39674f9adf884a8fb1f92ee3327d67784f (patch)
tree1900e454007eb111c1996973c48b12651b509fd3 /build
parent24d9df6a4fb04f200f6d0dc1e4d5cc37d655f94d (diff)
downloadandroid_development-52e0bf39674f9adf884a8fb1f92ee3327d67784f.tar.gz
android_development-52e0bf39674f9adf884a8fb1f92ee3327d67784f.tar.bz2
android_development-52e0bf39674f9adf884a8fb1f92ee3327d67784f.zip
Fix size and sha1sum for some sdk targets
Targets such as sdk_google_phone_{x86,arm,...}-sdk have wrong size and sha1sum in the repo-sys-img.xml, because the sdk_repo.mk file incorrectly over-writes the final images zip. bug: 20927015 Change-Id: I151c8759c299d4a943f00ca2734ef65dea727262
Diffstat (limited to 'build')
-rw-r--r--build/tools/sdk_repo.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/build/tools/sdk_repo.mk b/build/tools/sdk_repo.mk
index db8808a3b..bc8481e39 100644
--- a/build/tools/sdk_repo.mk
+++ b/build/tools/sdk_repo.mk
@@ -183,6 +183,7 @@ SDK_SYSIMG_XSD := \
# -----------------------------------------------------------------
# Rules for sdk addon
+ifneq ($(filter sdk_addon,$(MAKECMDGOALS)),)
ifneq ($(ADDON_SDK_ZIP),)
# ADDON_SDK_ZIP is defined in build/core/tasks/sdk-addon.sh and is
@@ -224,6 +225,7 @@ $(SDK_ADDON_IMG_XML): $(ADDON_SDK_IMG_ZIP)
$(call dist-for-goals, sdk_repo, $(SDK_ADDON_IMG_XML))
endif
+endif
# -----------------------------------------------------------------
# Rules for the SDK Repository XML