summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-04 14:42:02 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-10-04 14:42:02 +0000
commit5c3e25e66165818d89bf917eaea63466df9ed5b1 (patch)
tree3138b97c07499782036e5ae0adb5590f8982dccb
parent504f8cc5a1663008ac83e6eb660481f3509fecbf (diff)
parent0b5d4d46e5331b7e38a53a3151151dedbcaf94a9 (diff)
downloadlynx-platform-tools-34.0.5.tar.gz
Snap for 10900817 from 0b5d4d46e5331b7e38a53a3151151dedbcaf94a9 to sdk-releaseplatform-tools-34.0.5
Change-Id: I24534789ca925a297d4aa45acf6480205a60bb57
-rw-r--r--AndroidProducts.mk1
-rw-r--r--aosp_lynx_hwasan.mk23
-rw-r--r--device-lynx.mk2
3 files changed, 25 insertions, 1 deletions
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
index 2a82dde..c6046a3 100644
--- a/AndroidProducts.mk
+++ b/AndroidProducts.mk
@@ -16,6 +16,7 @@
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/aosp_lynx.mk \
+ $(LOCAL_DIR)/aosp_lynx_hwasan.mk \
$(LOCAL_DIR)/factory_lynx.mk
COMMON_LUNCH_CHOICES := \
diff --git a/aosp_lynx_hwasan.mk b/aosp_lynx_hwasan.mk
new file mode 100644
index 0000000..d0845b6
--- /dev/null
+++ b/aosp_lynx_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/lynx/aosp_lynx.mk)
+PRODUCT_NAME := aosp_lynx_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/device-lynx.mk b/device-lynx.mk
index 339f561..254f99c 100644
--- a/device-lynx.mk
+++ b/device-lynx.mk
@@ -194,7 +194,7 @@ PRODUCT_VENDOR_PROPERTIES += \
# Increment the SVN for any official public releases
PRODUCT_VENDOR_PROPERTIES += \
- ro.vendor.build.svn=6
+ ro.vendor.build.svn=8
# Set support hide display cutout feature
PRODUCT_PRODUCT_PROPERTIES += \