commit 56a1bba4f5d0732b0137b2558c106aa03c6c8ead
author Jorim Jaggi <jjaggi@google.com> Fri May 27 15:29:10 2016 -0700
committer Jorim Jaggi <jjaggi@google.com> Thu Sep 15 12:29:32 2016 -0700
tree 9d0facde5753e20f6a4f6e7c42803363cc170ac4
parent 8adb30ccbc4e8a13771368872454e33abd0bc011

Fix incremental builds

To cut build times in half if INCREMENTAL_BUILDS=true is enabled.

Bug: 27711635
Change-Id: I45a918b3bbb6c9e60f6ff93c7f00915f0e0d865f

packages/SystemUI/Android.mk

diff --git a/packages/SystemUI/Android.mk b/packages/SystemUI/Android.mk
index 258c82e..8c1ce24 100644
--- a/packages/SystemUI/Android.mk
+++ b/packages/SystemUI/Android.mk
@@ -43,9 +43,11 @@
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
-ifneq ($(SYSTEM_UI_INCREMENTAL_BUILDS),)
+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/base/packages/SettingsLib/common.mk