Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bbea4b5 authored Jan 12, 2011 by Ying Wang

Disable dexpreopt for unbundled build.

Cherry-picked from Honeycomb.

Change-Id: I1b8bf7faa3974f389a1f105b3397c4ceeea68885

parent 3fd580d4

core/java_library.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -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

core/package.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -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.