Merge "Allow compilation with Jack." (e1c00320) · Commits · e / os / android_frameworks_base

Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -409,6 +409,7 @@ LOCAL_JAVA_LIBRARIES := core-libart conscrypt okhttp core-junit bouncycastle ext
		LOCAL_MODULE := framework

		LOCAL_DX_FLAGS := --core-library --multi-dex
		LOCAL_JACK_FLAGS := --multi-dex native

		LOCAL_RMTYPEDEFS := true

		@@ -420,6 +421,7 @@ framework_module := $(LOCAL_INSTALLED_MODULE)
		framework_res_R_stamp := \
		$(call intermediates-dir-for,APPS,framework-res,,COMMON)/src/R.stamp
		$(full_classes_compiled_jar): $(framework_res_R_stamp)
		$(built_dex_intermediate): $(framework_res_R_stamp)

		$(framework_module): \| $(dir $(framework_module))framework-res.apk

core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk

+7 −1

Original line number	Diff line number	Diff line
		@@ -31,12 +31,18 @@ mainDexList:= \
		$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list

		LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex
		LOCAL_JACK_FLAGS := -D jack.dex.output.policy=minimal-multidex -D jack.preprocessor=true\
		-D jack.preprocessor.file=$(LOCAL_PATH)/test.jpp -D jack.dex.output.multidex.legacy=true
		ifeq ($(LOCAL_USE_JACK),true)
		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp
		endif

		LOCAL_DEX_PREOPT := false

		include $(BUILD_PACKAGE)

		$(mainDexList): $(full_classes_proguard_jar) \| $(HOST_OUT_EXECUTABLES)/mainDexClasses
		$(hide) mkdir -p $(dir $@)
		$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@
		echo "com/android/multidexlegacyandexception/Test.class" >> $@

core/tests/hosttests/test-apps/MultiDexLegacyAndException/test.jpp

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		test:
		@@com.android.jack.annotations.ForceInMainDex
		class com.android.multidexlegacyandexception.Test

core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk

+12 −1

Original line number	Diff line number	Diff line
		@@ -31,18 +31,23 @@ mainDexList:= \
		$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list

		LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex
		LOCAL_JACK_FLAGS := -D jack.dex.output.policy=minimal-multidex -D jack.preprocessor=true\
		-D jack.preprocessor.file=$(LOCAL_PATH)/test.jpp -D jack.dex.output.multidex.legacy=true
		ifeq ($(LOCAL_USE_JACK),true)
		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp
		endif

		LOCAL_DEX_PREOPT := false

		include $(BUILD_PACKAGE)

		$(mainDexList): $(full_classes_proguard_jar) \| $(HOST_OUT_EXECUTABLES)/mainDexClasses
		$(hide) mkdir -p $(dir $@)
		$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@
		echo "com/android/multidexlegacytestapp/Test.class" >> $@

		$(built_dex_intermediate): $(mainDexList)


		## The application with a full main dex
		include $(CLEAR_VARS)

		@@ -60,12 +65,18 @@ mainDexList2:= \
		$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list

		LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList2)
		LOCAL_JACK_FLAGS := -D jack.dex.output.policy=multidex -D jack.preprocessor=true\
		-D jack.preprocessor.file=$(LOCAL_PATH)/test.jpp -D jack.dex.output.multidex.legacy=true
		ifeq ($(LOCAL_USE_JACK),true)
		LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp
		endif

		LOCAL_DEX_PREOPT := false

		include $(BUILD_PACKAGE)

		$(mainDexList2): $(full_classes_proguard_jar) \| $(HOST_OUT_EXECUTABLES)/mainDexClasses
		$(hide) mkdir -p $(dir $@)
		$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@
		echo "com/android/multidexlegacytestapp/Test.class" >> $@

core/tests/hosttests/test-apps/MultiDexLegacyTestApp/test.jpp

0 → 100644

+3 −0

Original line number	Diff line number	Diff line
		test:
		@@com.android.jack.annotations.ForceInMainDex
		class com.android.multidexlegacytestapp.Test