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

Commit f2c0f4aa authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Fix maindexclasses use of proguard"

parents c8230798 03d341ad

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

+2 −7
Original line number Original line Diff line number Diff line
@@ -38,16 +38,11 @@ LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex 




LOCAL_MIN_SDK_VERSION := 8

LOCAL_MIN_SDK_VERSION := 8





LOCAL_JACK_FLAGS := -D jack.dex.output.policy=minimal-multidex \

     -D jack.dex.output.multidex.legacy=true



include $(BUILD_PACKAGE)

include $(BUILD_PACKAGE)





ifndef LOCAL_JACK_ENABLED

$(mainDexList): $(full_classes_pre_proguard_jar) $(MAINDEXCLASSES) $(PROGUARD_DEPS)

$(mainDexList): $(full_classes_pre_proguard_jar) | $(MAINDEXCLASSES)

	$(hide) mkdir -p $(dir $@)

	$(hide) mkdir -p $(dir $@)

	$(MAINDEXCLASSES) $< 1>$@

	PROGUARD_HOME=$(PROGUARD_HOME) $(MAINDEXCLASSES) $< 1>$@

	echo "com/android/multidexlegacyandexception/Test.class" >> $@

	echo "com/android/multidexlegacyandexception/Test.class" >> $@





$(built_dex_intermediate): $(mainDexList)
 
$(built_dex_intermediate): $(mainDexList)
 
endif

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -38,9 +38,9 @@ LOCAL_MIN_SDK_VERSION := 8 




include $(BUILD_PACKAGE)

include $(BUILD_PACKAGE)





$(mainDexList): $(full_classes_pre_proguard_jar) | $(MAINDEXCLASSES)

$(mainDexList): $(full_classes_pre_proguard_jar) $(MAINDEXCLASSES) $(PROGUARD_DEPS)

	$(hide) mkdir -p $(dir $@)

	$(hide) mkdir -p $(dir $@)

	$(MAINDEXCLASSES) $< 1>$@

	PROGUARD_HOME=$(PROGUARD_HOME) $(MAINDEXCLASSES) $< 1>$@

	echo "com/android/multidexlegacytestapp/Test.class" >> $@

	echo "com/android/multidexlegacytestapp/Test.class" >> $@





$(built_dex_intermediate): $(mainDexList)

$(built_dex_intermediate): $(mainDexList)
@@ -69,9 +69,9 @@ LOCAL_MIN_SDK_VERSION := 8 




include $(BUILD_PACKAGE)

include $(BUILD_PACKAGE)





$(mainDexList2): $(full_classes_pre_proguard_jar) | $(MAINDEXCLASSES)

$(mainDexList2): $(full_classes_pre_proguard_jar) $(MAINDEXCLASSES) $(PROGUARD_DEPS)

	$(hide) mkdir -p $(dir $@)

	$(hide) mkdir -p $(dir $@)

	$(MAINDEXCLASSES) $< 1>$@

	PROGUARD_HOME=$(PROGUARD_HOME) $(MAINDEXCLASSES) $< 1>$@

	echo "com/android/multidexlegacytestapp/Test.class" >> $@

	echo "com/android/multidexlegacytestapp/Test.class" >> $@





$(built_dex_intermediate): $(mainDexList2)
 
$(built_dex_intermediate): $(mainDexList2)

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

+2 −3
Original line number Original line Diff line number Diff line
@@ -30,14 +30,13 @@ 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_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

LOCAL_DEX_PREOPT := false





include $(BUILD_PACKAGE)

include $(BUILD_PACKAGE)





$(mainDexList): $(full_classes_pre_proguard_jar) | $(MAINDEXCLASSES)

$(mainDexList): $(full_classes_pre_proguard_jar) $(MAINDEXCLASSES) $(PROGUARD_DEPS)

	$(hide) mkdir -p $(dir $@)

	$(hide) mkdir -p $(dir $@)

	$(MAINDEXCLASSES) $< 1>$@

	PROGUARD_HOME=$(PROGUARD_HOME) $(MAINDEXCLASSES) $< 1>$@





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

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -35,9 +35,9 @@ LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex 




include $(BUILD_PACKAGE)

include $(BUILD_PACKAGE)





$(mainDexList): $(full_classes_pre_proguard_jar) | $(MAINDEXCLASSES)

$(mainDexList): $(full_classes_pre_proguard_jar) $(MAINDEXCLASSES) $(PROGUARD_DEPS)

	$(hide) mkdir -p $(dir $@)

	$(hide) mkdir -p $(dir $@)

	$(MAINDEXCLASSES) $< 1>$@

	PROGUARD_HOME=$(PROGUARD_HOME) $(MAINDEXCLASSES) $< 1>$@

	echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@

	echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@





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

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -35,9 +35,9 @@ LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex 




include $(BUILD_PACKAGE)

include $(BUILD_PACKAGE)





$(mainDexList): $(full_classes_pre_proguard_jar) | $(MAINDEXCLASSES)

$(mainDexList): $(full_classes_pre_proguard_jar) $(MAINDEXCLASSES) $(PROGUARD_DEPS)

	$(hide) mkdir -p $(dir $@)

	$(hide) mkdir -p $(dir $@)

	$(MAINDEXCLASSES) $< 1>$@

	PROGUARD_HOME=$(PROGUARD_HOME) $(MAINDEXCLASSES) $< 1>$@

	echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@

	echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@





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