Merge "Enable multi-dex for coverage builds to fix breakage" into nyc-mr2-dev (fbe70a3e) · Commits · e / os / android_frameworks_base

services/tests/servicestests/Android.mk

+5 −0

Original line number	Diff line number	Diff line
		@@ -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)

		#########################################################################