From 17ffa24277380c69bf365fa595e7d4e6e51825eb Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 20 Jun 2017 15:38:05 -0700 Subject: [PATCH] Enable multi-dex for dx Add LOCAL_DX_FLAGS := --multi-dex where it is enabled for jack. Also stop enabling multi-dex when coverge is enabled, since multi-dex is now enalbed unconditionally. Test: builds Change-Id: I67fedcdd5bb5d7091468bddcb0c22bab720a51d2 --- services/tests/notification/Android.mk | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/services/tests/notification/Android.mk b/services/tests/notification/Android.mk index 940db792489e9..0ffe6e4db6b8a 100644 --- a/services/tests/notification/Android.mk +++ b/services/tests/notification/Android.mk @@ -29,6 +29,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_JAVA_LIBRARIES := android.test.runner LOCAL_JACK_FLAGS := --multi-dex native +LOCAL_DX_FLAGS := --multi-dex LOCAL_PACKAGE_NAME := FrameworksNotificationTests LOCAL_COMPATIBILITY_SUITE := device-tests @@ -52,9 +53,4 @@ LOCAL_JNI_SHARED_LIBRARIES := \ 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)