From be2d3307e23f08bbc29e1b33b6aba9c7d05a5867 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 21 Dec 2016 16:48:32 -0800 Subject: [PATCH] Revert "Remove support of disabling Jack." This reverts commit ba068f48727dee2223b3be3b0359accb949e363d. Test: builds Change-Id: I2c4d64e26c2e4ceb710a39de2ee9749160d33a72 --- Android.mk | 3 ++ core/tests/coretests/Android.mk | 1 + .../MultiDexLegacyAndException/Android.mk | 19 ++++++++++ .../MultiDexLegacyTestApp/Android.mk | 38 +++++++++++++++++++ .../MultiDexLegacyTestServices/Android.mk | 12 ++++++ .../Android.mk | 19 ++++++++++ .../Android.mk | 19 ++++++++++ .../Android.mk | 20 ++++++++++ core/tests/systemproperties/Android.mk | 1 + 9 files changed, 132 insertions(+) diff --git a/Android.mk b/Android.mk index a798a311e0411..bf3d226a7869b 100644 --- a/Android.mk +++ b/Android.mk @@ -513,6 +513,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := framework-protos LOCAL_MODULE := framework +LOCAL_DX_FLAGS := --core-library --multi-dex LOCAL_JACK_FLAGS := --multi-dex native LOCAL_RMTYPEDEFS := true @@ -1348,6 +1349,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := libphonenumber-platform LOCAL_MODULE_TAGS := optional LOCAL_MODULE := ext +LOCAL_DX_FLAGS := --core-library + ifneq ($(INCREMENTAL_BUILDS),) LOCAL_PROGUARD_ENABLED := disabled LOCAL_JACK_ENABLED := incremental diff --git a/core/tests/coretests/Android.mk b/core/tests/coretests/Android.mk index 33a9265278ded..8ac52522f2a30 100644 --- a/core/tests/coretests/Android.mk +++ b/core/tests/coretests/Android.mk @@ -21,6 +21,7 @@ LOCAL_SRC_FILES := \ $(call all-java-files-under, DisabledTestApp/src) \ $(call all-java-files-under, EnabledTestApp/src) +LOCAL_DX_FLAGS := --core-library LOCAL_AAPT_FLAGS = -0 dat -0 gld -c fa LOCAL_STATIC_JAVA_LIBRARIES := \ core-tests-support \ diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk index 836ede61bba67..14b032e37f4ce 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk @@ -31,9 +31,28 @@ LOCAL_DEX_PREOPT := false LOCAL_JAVACFLAGS := -nowarn +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 +################################# +include $(BUILD_SYSTEM)/configure_local_jack.mk +################################# + +ifdef LOCAL_JACK_ENABLED LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp +endif include $(BUILD_PACKAGE) + +ifndef LOCAL_JACK_ENABLED +$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) + $(hide) mkdir -p $(dir $@) + $(MAINDEXCLASSES) $< 1>$@ + echo "com/android/multidexlegacyandexception/Test.class" >> $@ + +$(built_dex_intermediate): $(mainDexList) +endif diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk index 2915914033f78..208eceb6273d9 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk @@ -29,13 +29,32 @@ LOCAL_PACKAGE_NAME := MultiDexLegacyTestApp LOCAL_DEX_PREOPT := false +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 +################################# +include $(BUILD_SYSTEM)/configure_local_jack.mk +################################# + +ifdef LOCAL_JACK_ENABLED LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp +endif include $(BUILD_PACKAGE) +ifndef LOCAL_JACK_ENABLED +$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) + $(hide) mkdir -p $(dir $@) + $(MAINDEXCLASSES) $< 1>$@ + echo "com/android/multidexlegacytestapp/Test.class" >> $@ + +$(built_dex_intermediate): $(mainDexList) +endif + ## The application with a full main dex include $(CLEAR_VARS) @@ -51,9 +70,28 @@ LOCAL_PACKAGE_NAME := MultiDexLegacyTestApp2 LOCAL_DEX_PREOPT := false +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 +################################# +include $(BUILD_SYSTEM)/configure_local_jack.mk +################################# + +ifdef LOCAL_JACK_ENABLED LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp +endif include $(BUILD_PACKAGE) + +ifndef LOCAL_JACK_ENABLED +$(mainDexList2): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) + $(hide) mkdir -p $(dir $@) + $(MAINDEXCLASSES) $< 1>$@ + echo "com/android/multidexlegacytestapp/Test.class" >> $@ + +$(built_dex_intermediate): $(mainDexList2) +endif \ No newline at end of file diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk index 2732372263a85..99bcd6c62b56c 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk @@ -26,8 +26,20 @@ LOCAL_PACKAGE_NAME := MultiDexLegacyTestServices LOCAL_STATIC_JAVA_LIBRARIES := android-support-multidex +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.dex.output.multidex.legacy=true LOCAL_DEX_PREOPT := false include $(BUILD_PACKAGE) + +ifndef LOCAL_JACK_ENABLED +$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) + $(hide) mkdir -p $(dir $@) + $(MAINDEXCLASSES) $< 1>$@ + +$(built_dex_intermediate): $(mainDexList) +endif diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk index b4a666f352fad..1c7d807901206 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk @@ -28,9 +28,28 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-multidex LOCAL_DEX_PREOPT := false +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 +################################# +include $(BUILD_SYSTEM)/configure_local_jack.mk +################################# + +ifdef LOCAL_JACK_ENABLED LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp +endif include $(BUILD_PACKAGE) + +ifndef LOCAL_JACK_ENABLED +$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) + $(hide) mkdir -p $(dir $@) + $(MAINDEXCLASSES) $< 1>$@ + echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@ + +$(built_dex_intermediate): $(mainDexList) +endif \ No newline at end of file diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk index f38bd4f2321b1..b77cf31edc628 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk @@ -28,9 +28,28 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-multidex LOCAL_DEX_PREOPT := false +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 +################################# +include $(BUILD_SYSTEM)/configure_local_jack.mk +################################# + +ifdef LOCAL_JACK_ENABLED LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp +endif include $(BUILD_PACKAGE) + +ifndef LOCAL_JACK_ENABLED +$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) + $(hide) mkdir -p $(dir $@) + $(MAINDEXCLASSES) $< 1>$@ + echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@ + +$(built_dex_intermediate): $(mainDexList) +endif diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk index 5bc2c95e623d0..3631626f6b310 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk @@ -26,11 +26,31 @@ LOCAL_PACKAGE_NAME := MultiDexLegacyVersionedTestApp_v3 LOCAL_STATIC_JAVA_LIBRARIES := android-support-multidex +mainDexList:= \ + $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list + LOCAL_DEX_PREOPT := false +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 +################################# +include $(BUILD_SYSTEM)/configure_local_jack.mk +################################# + +ifdef LOCAL_JACK_ENABLED LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp +endif include $(BUILD_PACKAGE) + +ifndef LOCAL_JACK_ENABLED +$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) + $(hide) mkdir -p $(dir $@) + $(MAINDEXCLASSES) $< 1>$@ + echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@ + +$(built_dex_intermediate): $(mainDexList) +endif + diff --git a/core/tests/systemproperties/Android.mk b/core/tests/systemproperties/Android.mk index e16c3678dee7f..4c2e2247a113a 100644 --- a/core/tests/systemproperties/Android.mk +++ b/core/tests/systemproperties/Android.mk @@ -8,6 +8,7 @@ LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := \ $(call all-java-files-under, src) +LOCAL_DX_FLAGS := --core-library LOCAL_STATIC_JAVA_LIBRARIES := android-common frameworks-core-util-lib LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_PACKAGE_NAME := FrameworksCoreSystemPropertiesTests