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

Commit c0c11231 authored by Fyodor Kupolov's avatar Fyodor Kupolov
Browse files

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

services/tests/servicestests/Android.mk

+0 −3
Original line number Original line Diff line number Diff line
@@ -50,10 +50,7 @@ LOCAL_JNI_SHARED_LIBRARIES := libservicestestsjni \ 




LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk

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

LOCAL_JACK_FLAGS := --multi-dex native

endif # EMMA_INSTRUMENT_STATIC





LOCAL_STATIC_JAVA_LIBRARIES += ub-uiautomator

LOCAL_STATIC_JAVA_LIBRARIES += ub-uiautomator