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

am 1fd599cb: am 98c570ab: am 743938fb: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev

Browse Source 
* commit '1fd599cbaeac173245dfb675a28c27bf3fcb2eca':
  Make sure only AppCompat (not it's tests) are in the docs
This commit is contained in:
Chris Banes
2015-08-13 17:50:20 +00:00
committed by Android Git Automerger
parent 689c097eb3 1fd599cbae
commit 795c7aad8c
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/pathmap.mk
View File

@@ -108,7 +108,6 @@ FRAMEWORKS_SUPPORT_SUBDIRS := \
annotations \ annotations \
v4 \ v4 \
v7/gridlayout \ v7/gridlayout \
v7/appcompat \
v7/cardview \ v7/cardview \
v7/mediarouter \ v7/mediarouter \
v7/palette \ v7/palette \
@@ -137,6 +136,7 @@ FRAMEWORKS_MULTIDEX_SUBDIRS := \
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)) \ $(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_SUBDIRS)) \
frameworks/support/v7/appcompat/src \
frameworks/support/v7/recyclerview/src frameworks/support/v7/recyclerview/src
# #
@@ -144,6 +144,7 @@ FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \
# #
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))) \
android-support-v7-appcompat \
android-support-v7-recyclerview \ android-support-v7-recyclerview \
android-support-multidex \ android-support-multidex \
android-support-multidex-instrumentation android-support-multidex-instrumentation