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

Commit c2e68615 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES" am: 1498712a am: 51c1eeef 

am: 04158fac

Change-Id: Ib4ee0aeb0834fb248353d47859447f0988f09043
parents c0e492a4 04158fac

core/definitions.mk

+1 −1
Original line number Diff line number Diff line
@@ -417,7 +417,7 @@ endef 
define find-subdir-assets

$(sort $(if $(1),$(patsubst ./%,%, \

	$(shell if [ -d $(1) ] ; then cd $(1) ; find -L ./ -not -name '.*' -and -type f ; fi)), \

	$(warning Empty argument supplied to find-subdir-assets) \

	$(warning Empty argument supplied to find-subdir-assets in $(LOCAL_PATH)) \

))

endef

core/package_internal.mk

+2 −2
Original line number Diff line number Diff line
@@ -140,9 +140,9 @@ my_overlay_resources := $(strip \ 
    $(addprefix $(d)/, \

        $(call find-subdir-assets,$(d)))))



my_res_resources := $(strip \

my_res_resources := $(if $(my_res_dir),$(strip \

    $(addprefix $(my_res_dir)/, \

        $(call find-subdir-assets,$(my_res_dir))))

        $(call find-subdir-assets,$(my_res_dir)))))



all_resources := $(strip $(my_res_resources) $(my_overlay_resources))