diff options
| author | Ying Wang <wangying@google.com> | 2011-01-12 11:12:06 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2011-03-23 14:12:14 -0700 |
| commit | 7bbea4b5c1f053cbe428025e9f9dec0e50bcc551 (patch) | |
| tree | d83e074d541e86f4a69c9d8b3607cb54587eabfa | |
| parent | 3fd580d4e29657b812d3ab3c459487689a5f2da6 (diff) | |
| download | build-7bbea4b5c1f053cbe428025e9f9dec0e50bcc551.tar.gz | |
Disable dexpreopt for unbundled build.
Cherry-picked from Honeycomb.
Change-Id: I1b8bf7faa3974f389a1f105b3397c4ceeea68885
| -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 abc4728fae..dbf6981750 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 6834995512..34792d9042 100644 --- a/core/package.mk +++ b/core/package.mk @@ -155,12 +155,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. |