diff options
| author | Colin Cross <ccross@android.com> | 2017-05-10 16:29:40 -0700 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2017-05-11 15:39:58 +0100 |
| commit | d6fe10a3a95fd658f408c1221334c0f9ee771262 (patch) | |
| tree | 024dc4d8dbd00e828a6ca33106012ad4fdadf32b | |
| parent | 33d887d7bd60284426008b359e635358352e5342 (diff) | |
Fix javac build
Add --multi-dex to LOCAL_DX_FLAGS where it is enabled for jack.
Test: m -j ANDROID_COMPILE_WITH_JACK=false FrameworksWifiTests
(cherry picked from commit e874763180ecb2f7f1c35c3752bd147119ca204a)
Bug: 36902714
Change-Id: I922c04e733f21565ac7ae91ddb9d24dc982170cc
| -rw-r--r-- | tests/wifitests/Android.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/wifitests/Android.mk b/tests/wifitests/Android.mk index 5dbd75617..29c6749a6 100644 --- a/tests/wifitests/Android.mk +++ b/tests/wifitests/Android.mk @@ -49,6 +49,7 @@ jacoco_include := com.android.server.wifi.* LOCAL_JACK_COVERAGE_INCLUDE_FILTER := $(jacoco_include) LOCAL_JACK_COVERAGE_EXCLUDE_FILTER := $(jacoco_exclude) +LOCAL_DX_FLAGS := --multi-dex LOCAL_JACK_FLAGS := --multi-dex native # wifi-service and services must be included here so that the latest changes |