StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move multidex support library

Browse Source 
Multidex is being moved from frameworks/support/multidex to
frameworks/multidex.

GMS Core will be using the multidex library and has gotten special
approval to use the unreleased multidex library (i.e., guinea pig).

Bug: 10674263
Change-Id: I31f582dd7adf4db6eb19c52357875594fc9f7829
This commit is contained in:
Maurice Chu
2013-10-16 14:30:42 -07:00
committed by Yohann Roussel
parent 198bd8fd38
commit 664035f771
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/pathmap.mk
View File

@@ -110,7 +110,12 @@ FRAMEWORKS_SUPPORT_SUBDIRS := \
v7/appcompat \ v7/appcompat \
v7/mediarouter \ v7/mediarouter \
v8/renderscript \ v8/renderscript \
v13 \ v13
#
# A list of all source roots under frameworks/support.
#
FRAMEWORKS_MULTIDEX_SUBDIRS := \
multidex \ multidex \
multidex/instrumentation multidex/instrumentation
@@ -119,11 +124,13 @@ FRAMEWORKS_SUPPORT_SUBDIRS := \
# the root of the tree. # the root of the tree.
# #
FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \ FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \
$(addprefix frameworks/support/,$(FRAMEWORKS_SUPPORT_SUBDIRS)) $(addprefix frameworks/support/,$(FRAMEWORKS_SUPPORT_SUBDIRS)) \
$(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_SUBDIRS))
# #
# A list of support library modules. # A list of support library modules.
# #
FRAMEWORKS_SUPPORT_JAVA_LIBRARIES := \ FRAMEWORKS_SUPPORT_JAVA_LIBRARIES := \
$(foreach dir,$(FRAMEWORKS_SUPPORT_SUBDIRS),android-support-$(subst /,-,$(dir))) $(foreach dir,$(FRAMEWORKS_SUPPORT_SUBDIRS),android-support-$(subst /,-,$(dir))) \
$(foreach dir,$(FRAMEWORKS_MULTIDEX_SUBDIRS),android-support-$(subst /,-,$(dir)))