Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Manually disable dexopt for multidex test apps."

Browse Source
This commit is contained in:
Yohann Roussel
2014-06-30 15:48:02 +00:00
committed by Android (Google) Code Review
parent 76dc35cfe7 85fa4e19b2
commit dd59aba6c7
7 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/tests/hosttests/test-apps/MultiDexLegacyAndException/Android.mk
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

4
core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk
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

2
core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk
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

2
core/tests/hosttests/test-apps/MultiDexLegacyTestServicesTests/Android.mk
View File

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

2
core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk
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

2
core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk
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

2
core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk
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