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

Merge "Disable Java coverage for multidex tests." am: 11ce7bf502 am: f7ba6a3c5f am: fc3de7e3df

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1406250

Change-Id: I7c2c0d78e0624b7a6c749c6860ed567b97aa748a
This commit is contained in:
Oliver Nguyen
2020-08-24 11:53:53 +00:00
committed by Automerger Merge Worker
parent 0e72570b88 fc3de7e3df
commit 52cb714145
5 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk
View File

@@ -29,6 +29,8 @@ LOCAL_PACKAGE_NAME := MultiDexLegacyTestApp
LOCAL_DEX_PREOPT := false LOCAL_DEX_PREOPT := false
LOCAL_EMMA_INSTRUMENT := false
mainDexList:= \ mainDexList:= \
$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list
@@ -60,6 +62,8 @@ LOCAL_PACKAGE_NAME := MultiDexLegacyTestApp2
LOCAL_DEX_PREOPT := false LOCAL_DEX_PREOPT := false
LOCAL_EMMA_INSTRUMENT := false
mainDexList2:= \ mainDexList2:= \
$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list

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

@@ -33,6 +33,8 @@ LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex
LOCAL_DEX_PREOPT := false LOCAL_DEX_PREOPT := false
LOCAL_EMMA_INSTRUMENT := false
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)
$(mainDexList): $(full_classes_pre_proguard_jar) $(MAINDEXCLASSES) $(PROGUARD_DEPS) $(mainDexList): $(full_classes_pre_proguard_jar) $(MAINDEXCLASSES) $(PROGUARD_DEPS)

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

@@ -28,6 +28,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-multidex
LOCAL_DEX_PREOPT := false LOCAL_DEX_PREOPT := false
LOCAL_EMMA_INSTRUMENT := false
mainDexList:= \ mainDexList:= \
$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list

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

@@ -28,6 +28,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-multidex
LOCAL_DEX_PREOPT := false LOCAL_DEX_PREOPT := false
LOCAL_EMMA_INSTRUMENT := false
mainDexList:= \ mainDexList:= \
$(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list

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

@@ -31,6 +31,8 @@ mainDexList:= \
LOCAL_DEX_PREOPT := false LOCAL_DEX_PREOPT := false
LOCAL_EMMA_INSTRUMENT := false
LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex
include $(BUILD_PACKAGE) include $(BUILD_PACKAGE)