Merge "Don't run find on directories that don't exist"

am: c1df498f0c

Change-Id: If0792cb62b7e666ca700dbb9b0dbf4b3d6d3cd02
This commit is contained in:
Colin Cross 2017-01-11 23:54:27 +00:00 committed by android-build-merger
commit a8839ac623
1 changed files with 5 additions and 1 deletions

View File

@ -151,7 +151,11 @@ AUX_ALL_SUBARCHS :=
variant_sfx :=_aux_variant_config.mk
os_sfx :=_aux_os_config.mk
all_configs := $(shell find device vendor -maxdepth 4 -name '*$(variant_sfx)' -o -name '*$(os_sfx)' | sort)
config_roots := $(wildcard device vendor)
all_configs :=
ifdef config_roots
all_configs := $(shell find $(config_roots) -maxdepth 4 -name '*$(variant_sfx)' -o -name '*$(os_sfx)' | sort)
endif
all_os_configs := $(filter %$(os_sfx),$(all_configs))
all_variant_configs := $(filter %$(variant_sfx),$(all_configs))