commit b47cbd0dd562a81666f2dfed00e5aa1cc56bc946
author Doug Zongker <dougz@android.com> Tue Oct 16 11:02:13 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Oct 16 11:02:13 2012 -0700
tree 38a2f4eece279415eb11ad3060521d254ac94cbf
parent e215ed52c67cea6228f19fcc8bd11bdfb4f7cc67
parent b5f1d8bdc3bfaeec0efad17a77987774658f1cad

Merge "add multiple key support to signapk"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 3828f53..869379c 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -899,6 +899,7 @@
     $(filter $(TARGET_OUT_DATA)/%,$(tests_MODULES))
 endif
 
+ifneq (true,$(BOARD_DONT_BUILD_USERDATA_IMG))
 userdataimage_intermediates := \
     $(call intermediates-dir-for,PACKAGING,userdata)
 BUILT_USERDATAIMAGE_TARGET := $(PRODUCT_OUT)/userdata.img
@@ -924,6 +925,8 @@
 userdataimage-nodeps: | $(INTERNAL_USERIMAGES_DEPS)
 	$(build-userdataimage-target)
 
+endif # no BOARD_DONT_BUILD_USERDATA_IMG
+
 #######
 ## data partition tarball
 define build-userdatatarball-target