commit 5e9451b1cf33f74eff18c6f4a67ab2a8ea71ee79
author Dan Cashman <dcashman@google.com> Wed May 10 17:25:14 2017 -0700
committer Dan Cashman <dcashman@google.com> Wed May 10 17:26:02 2017 -0700
tree ddc8723e6943f08a8047eeb9d0187d200bc78004
parent 8c79670e5f89a8ead32d43803ea1b8f7d75dcd3c

Fix ASAN build.

Test: Build with ASAN on.
Bug: 36467375
Change-Id: Id6a07b7bd48f39326b7c7ab47cfde396f7cfd033

Android.mk

diff --git a/Android.mk b/Android.mk
index 7ff07c2..ee35e69 100644
--- a/Android.mk
+++ b/Android.mk
@@ -696,7 +696,7 @@
 
 local_fc_files := $(call build_policy, file_contexts, $(PLAT_PRIVATE_POLICY))
 ifneq ($(filter address,$(SANITIZE_TARGET)),)
-  local_fc_files += $(PLAT_PRIVATE_POLICY)/file_contexts_asan
+  local_fc_files += $(wildcard $(addsuffix /file_contexts_asan, $(PLAT_PRIVATE_POLICY)))
 endif
 local_fcfiles_with_nl := $(call add_nl, $(local_fc_files), $(built_nl))