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

Merge "Remove references to full_classes_proguard_jar"

Browse Source 
am: 6dfabc4353

Change-Id: I7a58cf68525f2e5ff60a50122dac5de781915bdc
This commit is contained in:
Colin Cross
2018-07-26 17:59:29 -07:00
committed by android-build-merger
parent 9e76e3acb9 6dfabc4353
commit 4a852ecdd6
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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