StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix warning with AAPT2 and LOCAL_STATIC_ANDROID_LIBRARIES

Browse Source 
Building with LOCAL_STATIC_ANDROID_LIBARIES and LOCAL_USE_APPT2
causes a warning:
build/core/package_internal.mk:143: Empty argument supplied to find-subdir-assets

Only call find-subdir-assets if my_res_dir is not empty.

Also improve the warning message to make it easier to find the module
that caused it.

Test: m -j
Change-Id: I9a71162c7e2ed82f64d6844baca256968ac77317
This commit is contained in:
Colin Cross
2016-11-29 11:12:56 -08:00
parent 31543713fc
commit fe10963496
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/package_internal.mk
View File

@@ -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))