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

Commit 11ce7bf5 authored by Oliver Nguyen's avatar Oliver Nguyen Committed by Gerrit Code Review
Browse files

Merge "Disable Java coverage for multidex tests."

parents 3fe6523d 69bbb330

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

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

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

+2 −0
Original line number 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_EMMA_INSTRUMENT := false



include $(BUILD_PACKAGE)



$(mainDexList): $(full_classes_pre_proguard_jar) $(MAINDEXCLASSES) $(PROGUARD_DEPS)

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

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

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

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

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

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