Always use multi-dex for FrameworksServiceTests

Otherwise it exceeds ids limit:
ERROR: Dex writing phase: classes.dex has too many IDs. Try using multi-dex

Test: manual - device builds, tests are running
Change-Id: I042cd1b8cb8d41c8db055ba8c6ceb56eb592c30f
This commit is contained in:
Fyodor Kupolov
2017-01-06 13:36:40 -08:00
parent a4a3e9df7a
commit c0c1123124

View File

@@ -50,10 +50,7 @@ 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
LOCAL_STATIC_JAVA_LIBRARIES += ub-uiautomator