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

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

Merge "Manually disable dexopt for multidex test apps."

parents 76dc35cf 85fa4e19

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

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ mainDexList:= \ 


LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex



LOCAL_DEX_PREOPT := false



include $(BUILD_PACKAGE)



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

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

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ mainDexList:= \ 


LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex



LOCAL_DEX_PREOPT := false



include $(BUILD_PACKAGE)



$(mainDexList): $(full_classes_proguard_jar) | $(HOST_OUT_EXECUTABLES)/mainDexClasses
@@ -59,6 +61,8 @@ mainDexList2:= \ 


LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList2)



LOCAL_DEX_PREOPT := false



include $(BUILD_PACKAGE)



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

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

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ mainDexList:= \ 


LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex



LOCAL_DEX_PREOPT := false



include $(BUILD_PACKAGE)



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

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

+2 −0
Original line number Diff line number Diff line
@@ -24,5 +24,7 @@ LOCAL_PACKAGE_NAME := MultiDexLegacyTestServicesTests 


LOCAL_SDK_VERSION := 9



LOCAL_DEX_PREOPT := false



include $(BUILD_PACKAGE)

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

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ mainDexList:= \ 


LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex



LOCAL_DEX_PREOPT := false



include $(BUILD_PACKAGE)



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