Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d353af5a authored by Oliver Nguyen's avatar Oliver Nguyen Committed by Automerger Merge Worker
Browse files

Merge "Disable Java coverage for multidex tests." am: 11ce7bf5 am:... 

Merge "Disable Java coverage for multidex tests." am: 11ce7bf5 am: f7ba6a3c am: fc3de7e3 am: 52cb7141 am: 788b3c7f

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

Change-Id: Icce40bcefe2da53c5c5e1547e183281c32cbbf2b
parents bc372d03 788b3c7f

core/tests/hosttests/test-apps/MultiDexLegacyTestApp/Android.mk

+4 −0
Original line number Original line Diff line number Diff line
@@ -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

core/tests/hosttests/test-apps/MultiDexLegacyTestServices/Android.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -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)

core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v1/Android.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -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

core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v2/Android.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -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

core/tests/hosttests/test-apps/MultiDexLegacyVersionedTestApp_v3/Android.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -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)