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

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

am 1029013a: Merge "Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex" 

* commit '1029013a':
  Put only src in FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS for multidex
parents 60c0454d 1029013a

core/pathmap.mk

+2 −2
Original line number Original line Diff line number Diff line
@@ -113,7 +113,7 @@ FRAMEWORKS_SUPPORT_SUBDIRS := \ 
        v13

        v13





#

#

# A list of all source roots under frameworks/support.

# A list of all source roots under frameworks/multidex.

#

#

FRAMEWORKS_MULTIDEX_SUBDIRS := \

FRAMEWORKS_MULTIDEX_SUBDIRS := \

        multidex \

        multidex \
@@ -125,7 +125,7 @@ FRAMEWORKS_MULTIDEX_SUBDIRS := \ 
#

#

FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \

FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \

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

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

        $(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_SUBDIRS))

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





#

#

# A list of support library modules.

# A list of support library modules.