Enable multi-dex for coverage builds to fix breakage
Test: m PRODUCT-bullhead-userdebug showcommands dist EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false tests
Change-Id: I6a324cbd0dc078ad2903345a069385d9f0d179ff
(cherry picked from commit aeaee4c5fe)
This commit is contained in:
@@ -47,6 +47,11 @@ LOCAL_JNI_SHARED_LIBRARIES := libservicestestsjni \
|
||||
|
||||
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
|
||||
|
||||
# Code coverage puts us over the dex limit, so enable multi-dex for coverage-enabled builds
|
||||
ifeq (true,$(EMMA_INSTRUMENT))
|
||||
LOCAL_JACK_FLAGS := --multi-dex native
|
||||
endif # EMMA_INSTRUMENT_STATIC
|
||||
|
||||
include $(BUILD_PACKAGE)
|
||||
|
||||
#########################################################################
|
||||
|
||||
Reference in New Issue
Block a user