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

Commit 4e0693cf authored by Yohann Roussel's avatar Yohann Roussel Committed by Android Git Automerger
Browse files

am 970d053c: Merge "Fix doc target for multidex support library." 

* commit '970d053c':
  Fix doc target for multidex support library.
parents d161be2d 970d053c

core/pathmap.mk

+5 −4
Original line number Diff line number Diff line
@@ -116,8 +116,8 @@ FRAMEWORKS_SUPPORT_SUBDIRS := \ 
# A list of all source roots under frameworks/multidex.

#

FRAMEWORKS_MULTIDEX_SUBDIRS := \

        multidex \

        multidex/instrumentation

        multidex/library/src \

        multidex/instrumentation/src



#

# A version of FRAMEWORKS_SUPPORT_SUBDIRS that is expanded to full paths from
@@ -125,12 +125,13 @@ FRAMEWORKS_MULTIDEX_SUBDIRS := \ 
#

FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \

	$(addprefix frameworks/support/,$(FRAMEWORKS_SUPPORT_SUBDIRS)) \

        $(addsuffix /src,$(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_SUBDIRS)))

	$(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_SUBDIRS))



#

# A list of support library modules.

#

FRAMEWORKS_SUPPORT_JAVA_LIBRARIES := \

    $(foreach dir,$(FRAMEWORKS_SUPPORT_SUBDIRS),android-support-$(subst /,-,$(dir))) \

    $(foreach dir,$(FRAMEWORKS_MULTIDEX_SUBDIRS),android-support-$(subst /,-,$(dir)))

    android-support-multidex \

    android-support-multidex-instrumentation