diff options
| author | 2020-08-24 12:39:05 +0000 | |
|---|---|---|
| committer | 2020-08-24 12:39:05 +0000 | |
| commit | d353af5ab72d04cc4bbe30e47d72cd5271cfd6d2 (patch) | |
| tree | 9573fbae2e3dfb39844158673cfcc8e4ae1a6632 | |
| parent | bc372d0352572a216aae12944fa4f6575863326d (diff) | |
| parent | 788b3c7f76f962ce159a02d409ee998ad0e92563 (diff) | |
Merge "Disable Java coverage for multidex tests." am: 11ce7bf502 am: f7ba6a3c5f am: fc3de7e3df am: 52cb714145 am: 788b3c7f76
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1406250
Change-Id: Icce40bcefe2da53c5c5e1547e183281c32cbbf2b
5 files changed, 12 insertions, 0 deletions
diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk index c577eeffd488..fe7c944ebd30 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk @@ -29,6 +29,8 @@ LOCAL_PACKAGE_NAME := MultiDexLegacyTestApp LOCAL_DEX_PREOPT := false +LOCAL_EMMA_INSTRUMENT := false + mainDexList:= \ $(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_EMMA_INSTRUMENT := false + mainDexList2:= \ $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk index da40940e92e9..3636c73ffc9c 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk @@ -33,6 +33,8 @@ LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex LOCAL_DEX_PREOPT := false +LOCAL_EMMA_INSTRUMENT := false + include $(BUILD_PACKAGE) $(mainDexList): $(full_classes_pre_proguard_jar) $(MAINDEXCLASSES) $(PROGUARD_DEPS) diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk index 665e22d5a0bc..67f1fa574c07 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk @@ -28,6 +28,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-multidex LOCAL_DEX_PREOPT := false +LOCAL_EMMA_INSTRUMENT := false + mainDexList:= \ $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk index c827fa80ebcd..33871e527820 100644 --- a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk +++ b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk @@ -28,6 +28,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-multidex LOCAL_DEX_PREOPT := false +LOCAL_EMMA_INSTRUMENT := false + mainDexList:= \ $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME),$(LOCAL_IS_HOST_MODULE),common)/maindex.list diff --git a/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk b/core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk index 3d6ad7d1aa57..1b267ee93cce 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_DEX_PREOPT := false +LOCAL_EMMA_INSTRUMENT := false + LOCAL_DX_FLAGS := --multi-dex --main-dex-list=$(mainDexList) --minimal-main-dex include $(BUILD_PACKAGE) |