am 35d2cf1c: (-s ours) am b4a027d0: (-s ours) Import translations. DO NOT MERGE

[android-x86/packages-apps-Settings.git] / Android.mk

diff --git a/Android.mk b/Android.mk
index 9cb7e2e..7043ad4 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -18,7 +18,13 @@ 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
 
 include $(BUILD_PACKAGE)