Merge "add PRODUCT_SOURCE_ROOT_DIRS product variable" am: d67a345f9a
am: 2e5dfd6a0b
Original change: https://android-review.googlesource.com/c/platform/build/+/2448662 Change-Id: Ic468ff195cbfaa55e00ce2aa6cbdf74ffca077a3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -50,12 +50,12 @@ ifneq ($(filter-out true false,$(my_modules_strict)),)
|
||||
$(error done)
|
||||
endif
|
||||
|
||||
my_missing_files = $(shell $(call echo-warning,$(my_makefile),$(my_package_name): Unknown installed file for module '$(1)'))
|
||||
my_missing_files = $(shell $(call echo-warning,$(my_makefile),$(my_package_name): Unknown installed file for module '$(1)'))$(shell$(call echo-warning,$(my_makefile),$(my_package_name): Some necessary modules may have been skipped by Soong. Check if PRODUCT_SOURCE_ROOT_DIRS is pruning necessary Android.bp files.))
|
||||
ifeq ($(ALLOW_MISSING_DEPENDENCIES),true)
|
||||
# Ignore unknown installed files on partial builds
|
||||
my_missing_files =
|
||||
else ifneq ($(my_modules_strict),false)
|
||||
my_missing_files = $(shell $(call echo-error,$(my_makefile),$(my_package_name): Unknown installed file for module '$(1)'))$(eval my_missing_error := true)
|
||||
my_missing_files = $(shell $(call echo-error,$(my_makefile),$(my_package_name): Unknown installed file for module '$(1)'))$(shell$(call echo-warning,$(my_makefile),$(my_package_name): Some necessary modules may have been skipped by Soong. Check if PRODUCT_SOURCE_ROOT_DIRS is pruning necessary Android.bp files.))$(eval my_missing_error := true)
|
||||
endif
|
||||
|
||||
# Iterate over modules' built files and installed files;
|
||||
|
Reference in New Issue
Block a user