Merge UP1A.231005.007
Bug: 291102124
Merged-In: I898dedb62b96757c69e7873ca859b95ef5371d9c
Change-Id: If43a7b647741cccd6e98c15fddc48f051f8f56f9
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 3b291cd..dd5513b 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,6 +16,7 @@
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/aosp_barbet.mk \
+ $(LOCAL_DIR)/aosp_barbet_hwasan.mk \
COMMON_LUNCH_CHOICES := \
aosp_barbet-userdebug \
diff --git a/aosp_barbet_hwasan.mk b/aosp_barbet_hwasan.mk
new file mode 100644
index 0000000..056d58e
--- /dev/null
+++ b/aosp_barbet_hwasan.mk
@@ -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/barbet/aosp_barbet.mk)
+PRODUCT_NAME := aosp_barbet_hwasan
+
+# Add "hwaddress" as a global sanitizer if it's missing.
+ifeq ($(filter hwaddress,$(SANITIZE_TARGET)),)
+ SANITIZE_TARGET := $(strip $(SANITIZE_TARGET) hwaddress)
+endif
diff --git a/barbet/BoardConfig.mk b/barbet/BoardConfig.mk
index c0356d8..b0b4108 100644
--- a/barbet/BoardConfig.mk
+++ b/barbet/BoardConfig.mk
@@ -36,3 +36,7 @@
-include vendor/google_devices/barbet/proprietary/BoardConfigVendor.mk
-include device/google/barbet/soong/pixel_soong_config.mk
+
+# TODO: Remove this. The qcom makefiles build files to the partition staging directories in a way
+# that isn't tracked by the build system, and causes incrementality bugs.
+BUILD_BROKEN_INCORRECT_PARTITION_IMAGES := true