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

Commit de873a64 authored by Yohann Roussel's avatar Yohann Roussel Committed by Android (Google) Code Review
Browse files

Merge "Adapt to change of LOCAL_USE_JACK values"

parents 323d888b f50a51fb

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

+4 −2
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ mainDexList:= \ 
LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex

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

    -D jack.preprocessor.file=$(LOCAL_PATH)/test.jpp -D jack.dex.output.multidex.legacy=true

ifeq ($(LOCAL_USE_JACK),true)



ifdef LOCAL_USE_JACK

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp

endif
@@ -41,10 +42,11 @@ LOCAL_DEX_PREOPT := false 


include $(BUILD_PACKAGE)



ifndef LOCAL_USE_JACK

$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses

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

	$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@

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



$(built_dex_intermediate): $(mainDexList)

endif

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

+6 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ mainDexList:= \ 
LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex

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

    -D jack.preprocessor.file=$(LOCAL_PATH)/test.jpp -D jack.dex.output.multidex.legacy=true

ifeq ($(LOCAL_USE_JACK),true)

ifdef LOCAL_USE_JACK

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp

endif
@@ -41,12 +41,14 @@ LOCAL_DEX_PREOPT := false 


include $(BUILD_PACKAGE)



ifndef LOCAL_USE_JACK

$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses

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

	$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@

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



$(built_dex_intermediate): $(mainDexList)

endif



## The application with a full main dex

include $(CLEAR_VARS)
@@ -67,7 +69,7 @@ mainDexList2:= \ 
LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList2)

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

    -D jack.preprocessor.file=$(LOCAL_PATH)/test.jpp -D jack.dex.output.multidex.legacy=true

ifeq ($(LOCAL_USE_JACK),true)

ifdef LOCAL_USE_JACK

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp

endif
@@ -75,9 +77,11 @@ LOCAL_DEX_PREOPT := false 


include $(BUILD_PACKAGE)



ifndef LOCAL_USE_JACK

$(mainDexList2): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses

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

	$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@

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



$(built_dex_intermediate): $(mainDexList2)

endif
 
 No newline at end of file

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

+2 −1
Original line number Diff line number Diff line
@@ -36,9 +36,10 @@ LOCAL_DEX_PREOPT := false 


include $(BUILD_PACKAGE)



ifndef LOCAL_USE_JACK

$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses

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

	$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@



$(built_dex_intermediate): $(mainDexList)

endif

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

+4 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ mainDexList:= \ 
LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex

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

    -D jack.preprocessor.file=$(LOCAL_PATH)/test.jpp -D jack.dex.output.multidex.legacy=true

ifeq ($(LOCAL_USE_JACK),true)



ifdef LOCAL_USE_JACK

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp

endif
@@ -40,9 +41,11 @@ LOCAL_DEX_PREOPT := false 


include $(BUILD_PACKAGE)



ifndef LOCAL_USE_JACK

$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses

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

	$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@

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



$(built_dex_intermediate): $(mainDexList)

endif
 
 No newline at end of file

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

+4 −1
Original line number Diff line number Diff line
@@ -32,7 +32,8 @@ mainDexList:= \ 
LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex

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

    -D jack.preprocessor.file=$(LOCAL_PATH)/test.jpp -D jack.dex.output.multidex.legacy=true

ifeq ($(LOCAL_USE_JACK),true)



ifdef LOCAL_USE_JACK

LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/test.jpp

endif
@@ -40,9 +41,11 @@ LOCAL_DEX_PREOPT := false 


include $(BUILD_PACKAGE)



ifndef LOCAL_USE_JACK

$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses

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

	$(HOST_OUT_EXECUTABLES)/mainDexClasses $< 1>$@

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



$(built_dex_intermediate): $(mainDexList)

endif