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

Commit 17ffa242 authored by Colin Cross's avatar Colin Cross
Browse files

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
parent e67952ad

services/tests/notification/Android.mk

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