OSDN Git Service
(root)
/
android-x86
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e019dfd
)
Generates SDK stubs of android-support-multidex
author
Yohann Roussel
<yroussel@google.com>
Wed, 21 Aug 2013 12:19:44 +0000
(14:19 +0200)
committer
Yohann Roussel
<yroussel@google.com>
Wed, 16 Jul 2014 10:43:36 +0000
(12:43 +0200)
(cherry picked from commit
c4441b8c3701147365213a1f789626a8d442db6e
)
Conflicts:
core/pathmap.mk
Change-Id: I9283e793d8cdbd4003b86fd33ff62dd35c663f1f
core/pathmap.mk
patch
|
blob
|
history
diff --git
a/core/pathmap.mk
b/core/pathmap.mk
index
28661c2
..
2b97dbf
100644
(file)
--- a/
core/pathmap.mk
+++ b/
core/pathmap.mk
@@
-110,7
+110,8
@@
FRAMEWORKS_SUPPORT_SUBDIRS := \
v7/appcompat \
v7/mediarouter \
v8/renderscript \
- v13
+ v13 \
+ multidex
#
# A version of FRAMEWORKS_SUPPORT_SUBDIRS that is expanded to full paths from