diff options
| author | Yohann Roussel <yroussel@google.com> | 2014-06-30 16:48:20 +0200 |
|---|---|---|
| committer | Yohann Roussel <yroussel@google.com> | 2014-06-30 16:48:20 +0200 |
| commit | 85fa4e19b260f35d55bd35c975753540211c62c0 (patch) | |
| tree | 6c38c699f6262ac07d958d149565d573661924c1 /core/tests | |
| parent | 2300d06a2ec25e9b71954005d98af83c543b6249 (diff) | |
| download | frameworks_base-85fa4e19b260f35d55bd35c975753540211c62c0.zip frameworks_base-85fa4e19b260f35d55bd35c975753540211c62c0.tar.gz frameworks_base-85fa4e19b260f35d55bd35c975753540211c62c0.tar.bz2 | |
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
Diffstat (limited to 'core/tests')
7 files changed, 16 insertions, 0 deletions
diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk index d649154..7839d26 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 6bb8d66..e2ab1a8 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 c97df59..329f544 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 d78e93a..85304b6 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 9f04228..e79fd71 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 1b8da41..3742004 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 945bfcc..7f400bc 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 |