From 85fa4e19b260f35d55bd35c975753540211c62c0 Mon Sep 17 00:00:00 2001 From: Yohann Roussel Date: Mon, 30 Jun 2014 16:48:20 +0200 Subject: [PATCH] Manually disable dexopt for multidex test apps. Because at the moment, omitting to explicitly disable dexopt produces apks with no classes.dex inside. Change-Id: I44ffc6b013a7b119c7deb332cf60f4fe8a11068c --- .../hosttests/test-apps/MultiDexLegacyAndException/Android.mk | 2 ++ .../hosttests/test-apps/MultiDexLegacyTestApp/Android.mk | 4 ++++ .../hosttests/test-apps/MultiDexLegacyTestServices/Android.mk | 2 ++ .../test-apps/MultiDexLegacyTestServicesTests/Android.mk | 2 ++ .../test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk | 2 ++ .../test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk | 2 ++ .../test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk | 2 ++ 7 files changed, 16 insertions(+) diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk index d649154a127d1..7839d2670ac28 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk @@ -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 diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk index 6bb8d6660d80c..e2ab1a8a35796 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk @@ -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 diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk index c97df59c9350b..329f5447f88e9 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk @@ -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 diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests/Android.mk index d78e93a0fb082..85304b65c63bb 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests/Android.mk @@ -24,5 +24,7 @@ LOCAL_PACKAGE_NAME := MultiDexLegacyTestServicesTests LOCAL_SDK_VERSION := 9 +LOCAL_DEX_PREOPT := false + include $(BUILD_PACKAGE) diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk index 9f042286753be..e79fd71accf1e 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk @@ -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 diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk index 1b8da41e48fe6..37420044d3245 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk @@ -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 diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk index 945bfccaadd07..7f400bc402411 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk @@ -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