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

Commit 71fc41df authored Sep 12, 2013 by Brian Carlstrom

Enable art for user builds

Bug: 10069754
Change-Id: Iaaff33a97bd7b68b2e8d84cd0034b15dde8a4316

parent 24cffbac

core/dex_preopt.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -56,7 +56,9 @@ $(_dbj_odex) : $(_dbj_src_jar) \| $(ACP) $(DEXPREOPT) $(DEXOPT)

		$(_dbj_jar_no_dex) : $(_dbj_src_jar) \| $(ACP) $(AAPT)
		$$(call copy-file-to-target)
		ifneq ($(DEX_PREOPT_DEFAULT),nostripping)
		$$(call dexpreopt-remove-classes.dex,$$@)
		endif

		$(eval _dbj_jar :=)
		$(eval _dbj_odex :=)

core/java_library.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ else
		ifeq (,$(TARGET_BUILD_APPS))
		ifeq (,$(LOCAL_APK_LIBRARIES))
		ifndef LOCAL_DEX_PREOPT
		LOCAL_DEX_PREOPT := true
		LOCAL_DEX_PREOPT := $(DEX_PREOPT_DEFAULT)
		endif
		endif
		endif

core/package.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ ifeq (,$(TARGET_BUILD_APPS))
		ifeq (,$(LOCAL_APK_LIBRARIES))
		ifneq (,$(LOCAL_SRC_FILES))
		ifndef LOCAL_DEX_PREOPT
		LOCAL_DEX_PREOPT := true
		LOCAL_DEX_PREOPT := $(DEX_PREOPT_DEFAULT)
		endif
		endif
		endif

target/product/core_minimal.mk

+1 −3

Original line number	Diff line number	Diff line
		@@ -59,8 +59,6 @@ PRODUCT_PACKAGES += \
		PRODUCT_BOOT_JARS := core:conscrypt:okhttp:core-junit:bouncycastle:ext:framework:framework2:android.policy:services:apache-xml:webviewchromium

		PRODUCT_RUNTIMES := runtime_libdvm_default
		ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
		PRODUCT_RUNTIMES += runtime_libart
		endif

		$(call inherit-product, $(SRC_TARGET_DIR)/product/base.mk)

target/product/runtime_libart.mk

+3 −0

Original line number	Diff line number	Diff line
		@@ -28,4 +28,7 @@ ifeq ($(WITH_HOST_DALVIK),true)
		core-libart-hostdex
		endif

		# We currently don't suport DEX_PREOPT for art
		DEX_PREOPT_DEFAULT := nostripping

		include $(SRC_TARGET_DIR)/product/runtime_common.mk