Merge "Sort SELinux package inclusion."
diff --git a/core/definitions.mk b/core/definitions.mk
index 1a9276c..698f52c 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -417,7 +417,7 @@
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
diff --git a/core/package_internal.mk b/core/package_internal.mk
index af1d2a5..5dd021c 100644
--- a/core/package_internal.mk
+++ b/core/package_internal.mk
@@ -140,9 +140,9 @@
$(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))