Snap for 6077728 from 07beec902562a7c4ec804609d3358dce05b99e88 to rvc-release

Change-Id: Iada77b54fdb08dfbe7294d67968e6404c1b772be

3 files changed, 24 insertions, 4 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
diff --git a/device.mk b/device.mk
index 35e0645..489d496 100644
--- a/device.mk
+++ b/device.mk
@@ -137,10 +137,6 @@ PRODUCT_PROPERTY_OVERRIDES += \
   ro.vibrator.hal.tick.duration=4 \
   ro.vibrator.hal.heavyclick.duration=12
 
-# Enable Perfetto traced
-PRODUCT_SYSTEM_DEFAULT_PROPERTIES += \
-    persist.traced.enable=1
-
 # Early phase offset for SurfaceFlinger (b/75985430)
 PRODUCT_PROPERTY_OVERRIDES += \
     debug.sf.early_phase_offset_ns=1500000