Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix maindexclasses use of proguard"

Browse Source
This commit is contained in:
Treehugger Robot
2019-01-18 22:18:50 +00:00
committed by Gerrit Code Review
parent c823079843 03d341adfb
commit f2c0f4aadf
6 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk
View File

@@ -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

8
core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk
View File

@@ -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)

5
core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk
View File

@@ -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)

4
core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk
View File

@@ -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)

4
core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk
View File

@@ -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)

4
core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk
View File

@@ -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)