From d1cd0bd5c449d535a81d212bdd6821df3cb5e8f9 Mon Sep 17 00:00:00 2001
From: Stephen Hines <srhines@google.com>
Date: Fri, 13 Dec 2019 18:21:10 -0800
Subject: [PATCH] Add aosp_walleye_hwasan build config.

Bug: 145023658
Test: lunch aosp_walleye_hwasan-userdebug
Change-Id: I7e74c3a53c6e8a31cb3e0653651f109befd90741
---
 AndroidProducts.mk     |  1 +
 aosp_walleye_hwasan.mk | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 aosp_walleye_hwasan.mk

diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 0ae0891..6d9add0 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -17,6 +17,7 @@
 PRODUCT_MAKEFILES := \
     $(LOCAL_DIR)/aosp_walleye.mk \
     $(LOCAL_DIR)/aosp_walleye_test.mk \
+    $(LOCAL_DIR)/aosp_walleye_hwasan.mk \
 
 COMMON_LUNCH_CHOICES := \
     aosp_walleye-userdebug \
diff --git a/aosp_walleye_hwasan.mk b/aosp_walleye_hwasan.mk
new file mode 100644
index 0000000..81afa64
--- /dev/null
+++ b/aosp_walleye_hwasan.mk
@@ -0,0 +1,23 @@
+#
+# Copyright 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+$(call inherit-product, device/google/walleye/aosp_walleye.mk)
+PRODUCT_NAME := aosp_walleye_hwasan
+
+# Add "hwaddress" as a global sanitizer if it's missing.
+ifeq ($(filter hwaddress,$(SANITIZE_TARGET)),)
+  SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) hwaddress)
+endif