OSDN Git Service
(root)
/
android-x86
/
packages-apps-Settings.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9fab5c1
)
Allow incremental builds for settings.
author
Jorim Jaggi
<jjaggi@google.com>
Fri, 24 Apr 2015 18:12:20 +0000
(11:12 -0700)
committer
Jorim Jaggi
<jjaggi@google.com>
Mon, 27 Apr 2015 21:16:03 +0000
(21:16 +0000)
Change-Id: Iec6788d42c63020b7facfdfc45e1add244bb9523
(cherry picked from commit
c9f73801dfd4815fdaaee1018f9ca40faf5befa1
)
Android.mk
patch
|
blob
|
history
diff --git
a/Android.mk
b/Android.mk
index
81f04f7
..
7043ad4
100644
(file)
--- 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