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

Commit 355520e3 authored by Yohann Roussel's avatar Yohann Roussel Committed by Android (Google) Code Review
Browse files

Merge "Fix doc target for multidex support library." into lmp-dev

parents 82af97fc 85cacbe0

core/pathmap.mk

+5 −4
Original line number Diff line number Diff line
@@ -121,8 +121,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
@@ -130,12 +130,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