From 06950638330236073737d92cf81402b3ca867a6d Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 26 Jul 2018 12:37:22 -0700 Subject: [PATCH] Remove references to full_classes_proguard_jar We always use R8 instead of proguard now, which shrinks while converting to dex, so there is is no proguarded classes jar. Use full_classes_pre_proguard_jar instead. Bug: 111885749 Test: m checkbuild Change-Id: Ia0c35d9068b72573ae5970dc7e2c2b1b489b32f3 --- .../hosttests/test-apps/MultiDexLegacyAndException/Android.mk | 2 +- .../hosttests/test-apps/MultiDexLegacyTestApp/Android.mk | 4 ++-- .../hosttests/test-apps/MultiDexLegacyTestServices/Android.mk | 2 +- .../test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk | 2 +- .../test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk | 2 +- .../test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk index c66a10cc31f7b..80ab4eae689b3 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk @@ -44,7 +44,7 @@ LOCAL_JACK_FLAGS := -D jack.dex.output.policy=minimal-multidex \ include $(BUILD_PACKAGE) ifndef LOCAL_JACK_ENABLED -$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) +$(mainDexList): $(full_classes_pre_proguard_jar) | $(MAINDEXCLASSES) $(hide) mkdir -p $(dir $@) $(MAINDEXCLASSES) $< 1>$@ echo "com/android/multidexlegacyandexception/Test.class" >> $@ diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk index c5e112b2e999c..cf8fc92c70268 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk @@ -38,7 +38,7 @@ LOCAL_MIN_SDK_VERSION := 8 include $(BUILD_PACKAGE) -$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) +$(mainDexList): $(full_classes_pre_proguard_jar) | $(MAINDEXCLASSES) $(hide) mkdir -p $(dir $@) $(MAINDEXCLASSES) $< 1>$@ echo "com/android/multidexlegacytestapp/Test.class" >> $@ @@ -69,7 +69,7 @@ LOCAL_MIN_SDK_VERSION := 8 include $(BUILD_PACKAGE) -$(mainDexList2): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) +$(mainDexList2): $(full_classes_pre_proguard_jar) | $(MAINDEXCLASSES) $(hide) mkdir -p $(dir $@) $(MAINDEXCLASSES) $< 1>$@ echo "com/android/multidexlegacytestapp/Test.class" >> $@ diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk index a6c537373f265..2ce50b3b75835 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk @@ -36,7 +36,7 @@ LOCAL_DEX_PREOPT := false include $(BUILD_PACKAGE) -$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) +$(mainDexList): $(full_classes_pre_proguard_jar) | $(MAINDEXCLASSES) $(hide) mkdir -p $(dir $@) $(MAINDEXCLASSES) $< 1>$@ diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk index da48df93a1d8e..8b0c750a9efc5 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk @@ -35,7 +35,7 @@ LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex include $(BUILD_PACKAGE) -$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) +$(mainDexList): $(full_classes_pre_proguard_jar) | $(MAINDEXCLASSES) $(hide) mkdir -p $(dir $@) $(MAINDEXCLASSES) $< 1>$@ echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@ diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk index 02b3f537758e9..a36c9934d87f1 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk @@ -35,7 +35,7 @@ LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex include $(BUILD_PACKAGE) -$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) +$(mainDexList): $(full_classes_pre_proguard_jar) | $(MAINDEXCLASSES) $(hide) mkdir -p $(dir $@) $(MAINDEXCLASSES) $< 1>$@ echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@ diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk index 480868460d6a4..6b7418c1adb17 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk @@ -35,7 +35,7 @@ LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex include $(BUILD_PACKAGE) -$(mainDexList): $(full_classes_proguard_jar) | $(MAINDEXCLASSES) +$(mainDexList): $(full_classes_pre_proguard_jar) | $(MAINDEXCLASSES) $(hide) mkdir -p $(dir $@) $(MAINDEXCLASSES) $< 1>$@ echo "com/android/framework/multidexlegacyversionedtestapp/MultiDexUpdateTest.class" >> $@