Merge "Disable Java coverage for multidex tests."
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user