diff options
| author | Chris Banes <chrisbanes@google.com> | 2015-08-13 17:36:49 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-13 17:36:49 +0000 |
| commit | 98c570abb2baf6f1b34a2220233257ad903f1de0 (patch) | |
| tree | a4c7093a0884e4e5646b7704e6c772483afe7577 /core | |
| parent | 17b069107654c04f0ec2cc44d54da3a44006c710 (diff) | |
| parent | 743938fb0d4f56d7d009486fb90891eab9b50897 (diff) | |
| download | build-98c570abb2baf6f1b34a2220233257ad903f1de0.zip build-98c570abb2baf6f1b34a2220233257ad903f1de0.tar.gz build-98c570abb2baf6f1b34a2220233257ad903f1de0.tar.bz2 | |
am 743938fb: Merge "Make sure only AppCompat (not it\'s tests) are in the docs" into mnc-dev
* commit '743938fb0d4f56d7d009486fb90891eab9b50897':
Make sure only AppCompat (not it's tests) are in the docs
Diffstat (limited to 'core')
| -rw-r--r-- | core/pathmap.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/pathmap.mk b/core/pathmap.mk index 97db9e6..b300ff5 100644 --- a/core/pathmap.mk +++ b/core/pathmap.mk @@ -108,7 +108,6 @@ FRAMEWORKS_SUPPORT_SUBDIRS := \ annotations \ v4 \ v7/gridlayout \ - v7/appcompat \ v7/cardview \ v7/mediarouter \ v7/palette \ @@ -137,6 +136,7 @@ FRAMEWORKS_MULTIDEX_SUBDIRS := \ FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \ $(addprefix frameworks/support/,$(FRAMEWORKS_SUPPORT_SUBDIRS)) \ $(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_SUBDIRS)) \ + frameworks/support/v7/appcompat/src \ frameworks/support/v7/recyclerview/src # @@ -144,6 +144,7 @@ FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \ # FRAMEWORKS_SUPPORT_JAVA_LIBRARIES := \ $(foreach dir,$(FRAMEWORKS_SUPPORT_SUBDIRS),android-support-$(subst /,-,$(dir))) \ + android-support-v7-appcompat \ android-support-v7-recyclerview \ android-support-multidex \ android-support-multidex-instrumentation |