diff options
| author | Ying Wang <wangying@google.com> | 2011-01-12 11:12:06 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2011-01-12 11:12:06 -0800 |
| commit | 94978cf495879120c2dadf7afb2058688546be09 (patch) | |
| tree | 58ae4c6c46bbd38584589819b6d57db11238e873 /core | |
| parent | 78064b4c694cab92ae66025564edcbfc2bbfc835 (diff) | |
| download | build-94978cf495879120c2dadf7afb2058688546be09.zip build-94978cf495879120c2dadf7afb2058688546be09.tar.gz build-94978cf495879120c2dadf7afb2058688546be09.tar.bz2 | |
Disable dexpreopt for unbundled build.
Change-Id: Iad0cc41cfad2533703a0dddad743720c43ddb667
Diffstat (limited to 'core')
| -rw-r--r-- | core/java_library.mk | 2 | ||||
| -rw-r--r-- | core/package.mk | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/core/java_library.mk b/core/java_library.mk index abc4728..dbf6981 100644 --- a/core/java_library.mk +++ b/core/java_library.mk @@ -30,10 +30,12 @@ common_javalib.jar := $(intermediates.COMMON)/$(LOCAL_BUILT_MODULE_STEM) LOCAL_INTERMEDIATE_TARGETS += $(common_javalib.jar) ifeq (true,$(WITH_DEXPREOPT)) +ifeq (,$(TARGET_BUILD_APPS)) ifndef LOCAL_DEX_PREOPT LOCAL_DEX_PREOPT := true endif endif +endif ################################# include $(BUILD_SYSTEM)/java.mk diff --git a/core/package.mk b/core/package.mk index 4033f8d..57d6f4b 100644 --- a/core/package.mk +++ b/core/package.mk @@ -148,12 +148,14 @@ endif # !custom LOCAL_PROGUARD_FLAGS := $(addprefix -include ,$(proguard_options_file)) $(LOCAL_PROGUARD_FLAGS) ifeq (true,$(WITH_DEXPREOPT)) +ifeq (,$(TARGET_BUILD_APPS)) ifneq (,$(LOCAL_SRC_FILES)) ifndef LOCAL_DEX_PREOPT LOCAL_DEX_PREOPT := true endif endif endif +endif # The dex files go in the package, so we don't # want to install them separately for this module. |