summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorim Jaggi <jjaggi@google.com>2015-04-24 11:12:20 -0700
committerJorim Jaggi <jjaggi@google.com>2015-04-27 21:16:03 +0000
commit11eae0450b9770bdef3509a620b8c54beba2bab3 (patch)
tree1604a33765c5c0d477e664a69cea1833714639f7
parent9fab5c1d94485093e7e6d4d6e938d444872bd226 (diff)
downloadpackages_apps_Settings-11eae0450b9770bdef3509a620b8c54beba2bab3.zip
packages_apps_Settings-11eae0450b9770bdef3509a620b8c54beba2bab3.tar.gz
packages_apps_Settings-11eae0450b9770bdef3509a620b8c54beba2bab3.tar.bz2
Allow incremental builds for settings.
Change-Id: Iec6788d42c63020b7facfdfc45e1add244bb9523 (cherry picked from commit c9f73801dfd4815fdaaee1018f9ca40faf5befa1)
-rw-r--r--Android.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 81f04f7..7043ad4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,6 +18,11 @@ LOCAL_PRIVILEGED_MODULE := true
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
+ifneq ($(INCREMENTAL_BUILDS),)
+ LOCAL_PROGUARD_ENABLED := disabled
+ LOCAL_JACK_ENABLED := incremental
+endif
+
include frameworks/opt/setupwizard/navigationbar/common.mk
include frameworks/opt/setupwizard/library/common.mk
include frameworks/base/packages/SettingsLib/common.mk