Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38400b46 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Don\'t hardcode expected path to mainDexClasses" 

am: be161337

* commit 'be161337':
  Don't hardcode expected path to mainDexClasses
parents 427edbce be161337

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

+2 −2
Original line number Diff line number Diff line
@@ -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)

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

+4 −4
Original line number Diff line number Diff line
@@ -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)

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

+2 −2
Original line number Diff line number Diff line
@@ -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

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

+2 −2
Original line number Diff line number Diff line
@@ -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)

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

+2 −2
Original line number Diff line number Diff line
@@ -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)