From d6fe10a3a95fd658f408c1221334c0f9ee771262 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 10 May 2017 16:29:40 -0700
Subject: 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
---
 tests/wifitests/Android.mk | 1 +
 1 file changed, 1 insertion(+)

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
-- 
cgit v1.2.3