summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-17 00:18:13 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2019-12-17 00:18:13 +0000
commit7c6287f0329217e97a8d5711ee46e6b1cd18dfb3 (patch)
tree114ae16759111a37ed5c1422923fb63ea12c582a
parent63cc06ae12ae09aa2f690ccdb192b19cd4404284 (diff)
parentb9353b397c37d207dde78afabcf5827bc2473368 (diff)
downloadtaimen-7c6287f0329217e97a8d5711ee46e6b1cd18dfb3.tar.gz
Add aosp_taimen_hwasan build config. am: 1c42e7b413 am: b9353b397c
Change-Id: Ia0a9acb7451b33f159dceb5621a836b02adf16bf
-rw-r--r--AndroidProducts.mk1
-rw-r--r--aosp_taimen_hwasan.mk23
2 files changed, 24 insertions, 0 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index f189694..a910025 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,6 +16,7 @@
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/aosp_taimen.mk \
+ $(LOCAL_DIR)/aosp_taimen_hwasan.mk \
COMMON_LUNCH_CHOICES := \
aosp_taimen-userdebug
diff --git a/aosp_taimen_hwasan.mk b/aosp_taimen_hwasan.mk
new file mode 100644
index 0000000..6446cdb
--- /dev/null
+++ b/aosp_taimen_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/taimen/aosp_taimen.mk)
+PRODUCT_NAME := aosp_taimen_hwasan
+
+# Add "hwaddress" as a global sanitizer if it's missing.
+ifeq ($(filter hwaddress,$(SANITIZE_TARGET)),)
+ SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) hwaddress)
+endif