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
This commit is contained in:
Yohann Roussel
2014-06-30 16:48:20 +02:00
parent 2300d06a2e
commit 85fa4e19b2
7 changed files with 16 additions and 0 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -24,5 +24,7 @@ LOCAL_PACKAGE_NAME := MultiDexLegacyTestServicesTests
LOCAL_SDK_VERSION := 9
LOCAL_DEX_PREOPT := false
include $(BUILD_PACKAGE)

View File

@@ -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

View File

@@ -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

View File

@@ -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