| commit | 770324964aa70e59f3974af9fb8812a17cc43819 | [log] [tgz] |
|---|---|---|
| author | Colin Cross <ccross@android.com> | Thu Mar 23 12:33:14 2017 -0700 |
| committer | Colin Cross <ccross@android.com> | Thu Mar 23 18:08:41 2017 -0700 |
| tree | e2c5c32e5f11c7e7c628997fdeb0b11fae51e03b | |
| parent | 79eca112eb1a624a8ca80863ad56dc8355cfe8e5 [diff] [blame] |
Enable multidex for dx Enable multidex for dx where it is already enabled for jack. Test: m -j ANDROID_COMPILE_WITH_JACK=false FrameworksServicesTests Change-Id: I55a6951ef471930e7737d9f93aaaffb567d4a580
diff --git a/services/tests/servicestests/Android.mk b/services/tests/servicestests/Android.mk index 2a8f4a3..bb4507d 100644 --- a/services/tests/servicestests/Android.mk +++ b/services/tests/servicestests/Android.mk
@@ -52,6 +52,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk LOCAL_JACK_FLAGS := --multi-dex native +LOCAL_DX_FLAGS := --multi-dex LOCAL_STATIC_JAVA_LIBRARIES += ub-uiautomator