From 75b22c67fc32f7d50a5f27673b3e36f67f776d8b Mon Sep 17 00:00:00 2001
From: Jorim Jaggi <jjaggi@google.com>
Date: Thu, 28 Jan 2016 20:06:32 -0800
Subject: [PATCH] Enable multi-dex for incremental settings builds

Change-Id: I265eb5ff508206bd5b4205db612c3519bb9a5ed8
---
 Android.mk | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Android.mk b/Android.mk
index 72db1abf0d3..683db504f20 100644
--- a/Android.mk
+++ b/Android.mk
@@ -35,6 +35,8 @@ LOCAL_AAPT_FLAGS := --auto-add-overlay \
 ifneq ($(INCREMENTAL_BUILDS),)
     LOCAL_PROGUARD_ENABLED := disabled
     LOCAL_JACK_ENABLED := incremental
+    LOCAL_DX_FLAGS := --multi-dex
+    LOCAL_JACK_FLAGS := --multi-dex native
 endif
 
 include frameworks/opt/setupwizard/library/common.mk