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

Commit 4a852ecd authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Remove references to full_classes_proguard_jar" 

am: 6dfabc43

Change-Id: I7a58cf68525f2e5ff60a50122dac5de781915bdc
parents 9e76e3ac 6dfabc43

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

+1 −1
Original line number Diff line number Diff line
@@ -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" >> $@

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

+2 −2
Original line number Diff line number Diff line
@@ -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" >> $@

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

+1 −1
Original line number Diff line number Diff line
@@ -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>$@

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

+1 −1
Original line number Diff line number Diff line
@@ -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" >> $@

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

+1 −1
Original line number Diff line number Diff line
@@ -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" >> $@