diff options
| author | 2015-12-02 16:24:08 -0800 | |
|---|---|---|
| committer | 2015-12-02 16:24:08 -0800 | |
| commit | b4ff8e481579bcd6bca41499bc53b476c0bbc429 (patch) | |
| tree | 8bf452ce2320ac8815de9c8889536836819ff006 | |
| parent | 3fe5a65b1cc621d40f6278dd1e38d5ec58f92fb6 (diff) | |
Don't hardcode expected path to mainDexClasses
Use MAINDEXCLASSES defined by the build system instead of manually using
$(HOST_OUT_EXECUTABLES)/mainDexClasses.
Change-Id: Iede13c243ef0c4e374c8e80bab4a995cea76b9b1
6 files changed, 14 insertions, 14 deletions
diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk index 78e718fbd3b4..edeecb2f62c3 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk @@ -47,9 +47,9 @@ endif include $(BUILD_PACKAGE) ifndef LOCAL_JACK_ENABLED -$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses +$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) $(hide) mkdir -p $(dir $@) - $(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@ + $(MAINDEXCLASSES) $< 1>$@ echo "com/android/multidexlegacyandexception/Test.class" >> $@ $(built_dex_intermediate): $(mainDexList) diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk index 7c699b610aed..7e4f0a99afa4 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk @@ -47,9 +47,9 @@ endif include $(BUILD_PACKAGE) ifndef LOCAL_JACK_ENABLED -$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses +$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) $(hide) mkdir -p $(dir $@) - $(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@ + $(MAINDEXCLASSES) $< 1>$@ echo "com/android/multidexlegacytestapp/Test.class" >> $@ $(built_dex_intermediate): $(mainDexList) @@ -88,9 +88,9 @@ endif include $(BUILD_PACKAGE) ifndef LOCAL_JACK_ENABLED -$(mainDexList2): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses +$(mainDexList2): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) $(hide) mkdir -p $(dir $@) - $(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@ + $(MAINDEXCLASSES) $< 1>$@ echo "com/android/multidexlegacytestapp/Test.class" >> $@ $(built_dex_intermediate): $(mainDexList2) diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk index b85c02c85ab6..99bcd6c62b56 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk @@ -37,9 +37,9 @@ LOCAL_DEX_PREOPT := false include $(BUILD_PACKAGE) ifndef LOCAL_JACK_ENABLED -$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses +$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) $(hide) mkdir -p $(dir $@) - $(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@ + $(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 0f1d9c037bf2..1c7d80790120 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk @@ -46,9 +46,9 @@ endif include $(BUILD_PACKAGE) ifndef LOCAL_JACK_ENABLED -$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses +$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) $(hide) mkdir -p $(dir $@) - $(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@ + $(MAINDEXCLASSES) $< 1>$@ echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@ $(built_dex_intermediate): $(mainDexList) diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk index 67ca483fe4c2..b77cf31edc62 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk @@ -46,9 +46,9 @@ endif include $(BUILD_PACKAGE) ifndef LOCAL_JACK_ENABLED -$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses +$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) $(hide) mkdir -p $(dir $@) - $(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@ + $(MAINDEXCLASSES) $< 1>$@ echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@ $(built_dex_intermediate): $(mainDexList) diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk index bf2efb1e493f..3631626f6b31 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk @@ -46,9 +46,9 @@ endif include $(BUILD_PACKAGE) ifndef LOCAL_JACK_ENABLED -$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses +$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) $(hide) mkdir -p $(dir $@) - $(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@ + $(MAINDEXCLASSES) $< 1>$@ echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@ $(built_dex_intermediate): $(mainDexList) |