diff options
| author | Chris Banes <chrisbanes@google.com> | 2015-08-13 17:28:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-08-13 17:28:32 +0000 |
| commit | 743938fb0d4f56d7d009486fb90891eab9b50897 (patch) | |
| tree | 99a70c465af1117cdac9af46e5d92703c4cd8871 /core | |
| parent | 5bf35d0685ba62ded55cc63f3dd2f23b82cc645d (diff) | |
| parent | b916a5bcbc346f37ca89290fe6f411074e048f0f (diff) | |
| download | build-743938fb0d4f56d7d009486fb90891eab9b50897.zip build-743938fb0d4f56d7d009486fb90891eab9b50897.tar.gz build-743938fb0d4f56d7d009486fb90891eab9b50897.tar.bz2 | |
Merge "Make sure only AppCompat (not it's tests) are in the docs" into mnc-dev
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 |