From c0c1123124d8a847bb57dee8bbea986f192b5daf Mon Sep 17 00:00:00 2001
From: Fyodor Kupolov <fkupolov@google.com>
Date: Fri, 6 Jan 2017 13:36:40 -0800
Subject: [PATCH] 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
---
 services/tests/servicestests/Android.mk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk
index ae5da78bbab55..f934d347080fb 100644
--- a/services/tests/servicestests/Android.mk
+++ b/services/tests/servicestests/Android.mk
@@ -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