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

Commit 7b734fd8 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

Merge "Allow multiple asset directories in aapt" into klp-modular-dev

parents 303d2755 64cf9807

core/package.mk

+8 −2
Original line number Diff line number Diff line
@@ -100,8 +100,14 @@ package_resource_overlays := $(strip \ 


LOCAL_RESOURCE_DIR := $(package_resource_overlays) $(LOCAL_RESOURCE_DIR)



all_assets := $(call find-subdir-assets,$(LOCAL_ASSET_DIR))

all_assets := $(addprefix $(LOCAL_ASSET_DIR)/,$(patsubst assets/%,%,$(all_assets)))

all_assets := $(strip \

    $(foreach dir, $(LOCAL_ASSET_DIR), \

      $(addprefix $(dir)/, \

        $(patsubst assets/%,%, \

          $(call find-subdir-assets, $(dir)) \

         ) \

       ) \

     ))



all_resources := $(strip \

    $(foreach dir, $(LOCAL_RESOURCE_DIR), \