diff options
| author | Yohann Roussel <yroussel@google.com> | 2014-12-04 09:26:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-12-04 09:26:54 +0000 |
| commit | e1c00320b674f2416029694f3486e79fb28afdd0 (patch) | |
| tree | 30396f2384790c9b4a29fd7867b8e74417d57f25 /core/tests/hosttests/test-apps | |
| parent | 48d196b9c50afe9aff50f4f8ec6acc6a066bbfdb (diff) | |
| parent | 248ef6f9c414db26fd1bc7ec3d4ee4f3b87d54cf (diff) | |
| download | frameworks_base-e1c00320b674f2416029694f3486e79fb28afdd0.zip frameworks_base-e1c00320b674f2416029694f3486e79fb28afdd0.tar.gz frameworks_base-e1c00320b674f2416029694f3486e79fb28afdd0.tar.bz2 | |
Merge "Allow compilation with Jack."
Diffstat (limited to 'core/tests/hosttests/test-apps')
11 files changed, 54 insertions, 4 deletions
diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk index 7839d26..0002ba7 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk @@ -28,15 +28,21 @@ LOCAL_SDK_VERSION := current LOCAL_PACKAGE_NAME := MultiDexLegacyAndException mainDexList:= \ - $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list + $(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" >> $@ diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/test.jpp b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/test.jpp new file mode 100644 index 0000000..0d027ed --- /dev/null +++ b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/test.jpp @@ -0,0 +1,3 @@ +test: + @@com.android.jack.annotations.ForceInMainDex + class com.android.multidexlegacyandexception.Test diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk index e2ab1a8..c9dbb57 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk @@ -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" >> $@ diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/test.jpp b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/test.jpp new file mode 100644 index 0000000..a1f5656 --- /dev/null +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/test.jpp @@ -0,0 +1,3 @@ +test: + @@com.android.jack.annotations.ForceInMainDex + class com.android.multidexlegacytestapp.Test diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk index 329f544..16e396b 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk @@ -30,12 +30,14 @@ 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) $(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses + $(hide) mkdir -p $(dir $@) $(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@ $(built_dex_intermediate): $(mainDexList) diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk index e79fd71..c62238b 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk @@ -30,14 +30,19 @@ 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/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@ $(built_dex_intermediate): $(mainDexList) - diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/test.jpp b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/test.jpp new file mode 100644 index 0000000..6d384e3 --- /dev/null +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/test.jpp @@ -0,0 +1,3 @@ +test: + @@com.android.jack.annotations.ForceInMainDex + class com.android.framework.multidexlegacyversionedtestapp.MultiDexUpdateTest diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk index 3742004..8c0c5d5 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk @@ -30,14 +30,19 @@ 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/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@ $(built_dex_intermediate): $(mainDexList) - diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/test.jpp b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/test.jpp new file mode 100644 index 0000000..6d384e3 --- /dev/null +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/test.jpp @@ -0,0 +1,3 @@ +test: + @@com.android.jack.annotations.ForceInMainDex + class com.android.framework.multidexlegacyversionedtestapp.MultiDexUpdateTest diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk index 7f400bc..002c1cc 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk @@ -30,12 +30,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/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@ diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/test.jpp b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/test.jpp new file mode 100644 index 0000000..6d384e3 --- /dev/null +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/test.jpp @@ -0,0 +1,3 @@ +test: + @@com.android.jack.annotations.ForceInMainDex + class com.android.framework.multidexlegacyversionedtestapp.MultiDexUpdateTest |