Merge "Add aosp_bluejay_hwasan" into main am: 20153b7051 am: fee2a1d564

Original change: https://android-review.googlesource.com/c/device/google/bluejay/+/2729338

Change-Id: I897901016c94cf34695b5d04fe6c91fa4b7fa3b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-08-29 00:27:46 +00:00 committed by Automerger Merge Worker
commit f22c744c3c
2 changed files with 24 additions and 0 deletions

View file

@ -16,6 +16,7 @@
PRODUCT_MAKEFILES := \ PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/aosp_bluejay.mk \ $(LOCAL_DIR)/aosp_bluejay.mk \
$(LOCAL_DIR)/aosp_bluejay_hwasan.mk \
$(LOCAL_DIR)/factory_bluejay.mk $(LOCAL_DIR)/factory_bluejay.mk

23
aosp_bluejay_hwasan.mk Normal file
View file

@ -0,0 +1,23 @@
#
# Copyright 2023 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/bluejay/aosp_bluejay.mk)
PRODUCT_NAME := aosp_bluejay_hwasan
# Add "hwaddress" as a global sanitizer if it's missing.
ifeq ($(filter hwaddress,$(SANITIZE_TARGET)),)
SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) hwaddress)
endif