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:
c7947b7
)
Enable multi-dex for incremental settings builds
author
Jorim Jaggi
<jjaggi@google.com>
Fri, 29 Jan 2016 04:06:32 +0000
(20:06 -0800)
committer
Jorim Jaggi
<jjaggi@google.com>
Fri, 29 Jan 2016 23:15:18 +0000
(15:15 -0800)
Change-Id: I265eb5ff508206bd5b4205db612c3519bb9a5ed8
Android.mk
patch
|
blob
|
history
diff --git
a/Android.mk
b/Android.mk
index
72db1ab
..
683db50
100644
(file)
--- 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