diff options
| author | Yohann Roussel <yroussel@google.com> | 2015-02-05 11:01:34 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-02-05 11:01:36 +0000 |
| commit | de873a64c8b5751391d3947d0c799b83ac40d7a8 (patch) | |
| tree | c2c7986c214658b91385a6559eda4d70e219508b /core/tests | |
| parent | 323d888b64eec7dcbfe1b9b0831df872ba463de3 (diff) | |
| parent | f50a51fb4c8d5ca973ce910a21bddf9f8466cb51 (diff) | |
| download | frameworks_base-de873a64c8b5751391d3947d0c799b83ac40d7a8.zip frameworks_base-de873a64c8b5751391d3947d0c799b83ac40d7a8.tar.gz frameworks_base-de873a64c8b5751391d3947d0c799b83ac40d7a8.tar.bz2 | |
Merge "Adapt to change of LOCAL_USE_JACK values"
Diffstat (limited to 'core/tests')
6 files changed, 24 insertions, 8 deletions
diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk index 0002ba7..7bf5f65 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk @@ -33,7 +33,8 @@ mainDexList:= \ 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) + +ifdef LOCAL_USE_JACK LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp endif @@ -41,10 +42,11 @@ LOCAL_DEX_PREOPT := false include $(BUILD_PACKAGE) +ifndef LOCAL_USE_JACK $(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses $(hide) mkdir -p $(dir $@) $(HOST_OUT_EXECUTABLES)/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 c9dbb57..416c238 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk @@ -33,7 +33,7 @@ mainDexList:= \ 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) +ifdef LOCAL_USE_JACK LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp endif @@ -41,12 +41,14 @@ LOCAL_DEX_PREOPT := false include $(BUILD_PACKAGE) +ifndef LOCAL_USE_JACK $(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) +endif ## The application with a full main dex include $(CLEAR_VARS) @@ -67,7 +69,7 @@ mainDexList2:= \ 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) +ifdef LOCAL_USE_JACK LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp endif @@ -75,9 +77,11 @@ LOCAL_DEX_PREOPT := false include $(BUILD_PACKAGE) +ifndef LOCAL_USE_JACK $(mainDexList2): $(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): $(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 16e396b..83ead4b 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk @@ -36,9 +36,10 @@ LOCAL_DEX_PREOPT := false include $(BUILD_PACKAGE) +ifndef LOCAL_USE_JACK $(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses $(hide) mkdir -p $(dir $@) $(HOST_OUT_EXECUTABLES)/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 c62238b..d706ca9 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk @@ -32,7 +32,8 @@ mainDexList:= \ 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) + +ifdef LOCAL_USE_JACK LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp endif @@ -40,9 +41,11 @@ LOCAL_DEX_PREOPT := false include $(BUILD_PACKAGE) +ifndef LOCAL_USE_JACK $(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) +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 8c0c5d5..99b2a8b 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk @@ -32,7 +32,8 @@ mainDexList:= \ 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) + +ifdef LOCAL_USE_JACK LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp endif @@ -40,9 +41,11 @@ LOCAL_DEX_PREOPT := false include $(BUILD_PACKAGE) +ifndef LOCAL_USE_JACK $(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) +endif diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk index 002c1cc..3ee1c22 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk @@ -32,7 +32,8 @@ mainDexList:= \ 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) + +ifdef LOCAL_USE_JACK LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp endif @@ -40,10 +41,12 @@ LOCAL_DEX_PREOPT := false include $(BUILD_PACKAGE) +ifndef LOCAL_USE_JACK $(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) +endif |