Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0fd694f3 authored by Chris Banes's avatar Chris Banes Committed by Android Git Automerger
Browse files

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

* commit '743938fb':
  Make sure only AppCompat (not it's tests) are in the docs
parents dc0e7244 743938fb
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ FRAMEWORKS_SUPPORT_SUBDIRS := \
        annotations \
        v4 \
        v7/gridlayout \
        v7/appcompat \
        v7/cardview \
        v7/mediarouter \
        v7/palette \
@@ -140,6 +139,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

#
@@ -147,6 +147,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