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

Commit b4ff8e48 authored by Colin Cross's avatar Colin Cross
Browse files

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
parent 3fe5a65b
Loading
Loading
Loading
Loading
+2 −2
Original line number Original line Diff line number Diff line
@@ -47,9 +47,9 @@ endif
include $(BUILD_PACKAGE)
include $(BUILD_PACKAGE)


ifndef LOCAL_JACK_ENABLED
ifndef LOCAL_JACK_ENABLED
$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses
$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)
	$(hide) mkdir -p $(dir $@)
	$(hide) mkdir -p $(dir $@)
	$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@
	$(MAINDEXCLASSES) $< 1>$@
	echo "com/android/multidexlegacyandexception/Test.class" >> $@
	echo "com/android/multidexlegacyandexception/Test.class" >> $@


$(built_dex_intermediate): $(mainDexList)
$(built_dex_intermediate): $(mainDexList)
+4 −4
Original line number Original line Diff line number Diff line
@@ -47,9 +47,9 @@ endif
include $(BUILD_PACKAGE)
include $(BUILD_PACKAGE)


ifndef LOCAL_JACK_ENABLED
ifndef LOCAL_JACK_ENABLED
$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses
$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)
	$(hide) mkdir -p $(dir $@)
	$(hide) mkdir -p $(dir $@)
	$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@
	$(MAINDEXCLASSES) $< 1>$@
	echo "com/android/multidexlegacytestapp/Test.class" >> $@
	echo "com/android/multidexlegacytestapp/Test.class" >> $@


$(built_dex_intermediate): $(mainDexList)
$(built_dex_intermediate): $(mainDexList)
@@ -88,9 +88,9 @@ endif
include $(BUILD_PACKAGE)
include $(BUILD_PACKAGE)


ifndef LOCAL_JACK_ENABLED
ifndef LOCAL_JACK_ENABLED
$(mainDexList2): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses
$(mainDexList2): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)
	$(hide) mkdir -p $(dir $@)
	$(hide) mkdir -p $(dir $@)
	$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@
	$(MAINDEXCLASSES) $< 1>$@
	echo "com/android/multidexlegacytestapp/Test.class" >> $@
	echo "com/android/multidexlegacytestapp/Test.class" >> $@


$(built_dex_intermediate): $(mainDexList2)
$(built_dex_intermediate): $(mainDexList2)
+2 −2
Original line number Original line Diff line number Diff line
@@ -37,9 +37,9 @@ LOCAL_DEX_PREOPT := false
include $(BUILD_PACKAGE)
include $(BUILD_PACKAGE)


ifndef LOCAL_JACK_ENABLED
ifndef LOCAL_JACK_ENABLED
$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses
$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)
	$(hide) mkdir -p $(dir $@)
	$(hide) mkdir -p $(dir $@)
	$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@
	$(MAINDEXCLASSES) $< 1>$@


$(built_dex_intermediate): $(mainDexList)
$(built_dex_intermediate): $(mainDexList)
endif
endif
+2 −2
Original line number Original line Diff line number Diff line
@@ -46,9 +46,9 @@ endif
include $(BUILD_PACKAGE)
include $(BUILD_PACKAGE)


ifndef LOCAL_JACK_ENABLED
ifndef LOCAL_JACK_ENABLED
$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses
$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)
	$(hide) mkdir -p $(dir $@)
	$(hide) mkdir -p $(dir $@)
	$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@
	$(MAINDEXCLASSES) $< 1>$@
	echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@
	echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@


$(built_dex_intermediate): $(mainDexList)
$(built_dex_intermediate): $(mainDexList)
+2 −2
Original line number Original line Diff line number Diff line
@@ -46,9 +46,9 @@ endif
include $(BUILD_PACKAGE)
include $(BUILD_PACKAGE)


ifndef LOCAL_JACK_ENABLED
ifndef LOCAL_JACK_ENABLED
$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses
$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES)
	$(hide) mkdir -p $(dir $@)
	$(hide) mkdir -p $(dir $@)
	$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@
	$(MAINDEXCLASSES) $< 1>$@
	echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@
	echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@


$(built_dex_intermediate): $(mainDexList)
$(built_dex_intermediate): $(mainDexList)
Loading