tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES" am: 1498712a6b

Browse source 
am: 51c1eeefb3

Change-Id: I5e05a8d69bc1bf02e8831333a1bbe483e13e3227
This commit is contained in:
Colin Cross 2016-12-02 22:09:27 +00:00 committed by android-build-merger
commit 04158fac7c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/definitions.mk
View file

@ -417,7 +417,7 @@ endef
define find-subdir-assets define find-subdir-assets
$(sort $(if $(1),$(patsubst ./%,%, \ $(sort $(if $(1),$(patsubst ./%,%, \
$(shell if [ -d $(1) ] ; then cd $(1) ; find -L ./ -not -name '.*' -and -type f ; fi)), \ $(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 endef

4
core/package_internal.mk
View file

@ -140,9 +140,9 @@ my_overlay_resources := $(strip \
$(addprefix $(d)/, \ $(addprefix $(d)/, \
$(call find-subdir-assets,$(d))))) $(call find-subdir-assets,$(d)))))
my_res_resources := $(strip \ my_res_resources := $(if $(my_res_dir),$(strip \
$(addprefix $(my_res_dir)/, \ $(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)) all_resources := $(strip $(my_res_resources) $(my_overlay_resources))