From 5e9451b1cf33f74eff18c6f4a67ab2a8ea71ee79 Mon Sep 17 00:00:00 2001
From: Dan Cashman <dcashman@google.com>
Date: Wed, 10 May 2017 17:25:14 -0700
Subject: [PATCH] Fix ASAN build.

Test: Build with ASAN on.
Bug: 36467375
Change-Id: Id6a07b7bd48f39326b7c7ab47cfde396f7cfd033
---
 Android.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 7ff07c201..ee35e69c8 100644
--- a/Android.mk
+++ b/Android.mk
@@ -696,7 +696,7 @@ include $(BUILD_SYSTEM)/base_rules.mk
 
 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))
 
-- 
GitLab