commit 2a5719c809686bda01df28df85d5f948986fbd17
author Po-Chien Hsueh <pchsueh@google.com> Fri Oct 02 03:53:01 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Oct 02 03:53:01 2020 +0000
tree 2a3f14a4d623e60c6f97e53b2829e5887b7b5470
parent 3ed9b8b7f95380912a1e8e4c11ad06cf6783ddd9
parent e3b44f551c286561a1f7a9f38c51d182e76d4542

Merge "Filter out host paths on platform-availability-check errors"

target/product/base_system.mk

diff --git a/target/product/base_system.mk b/target/product/base_system.mk
index b97d98d..586c058 100644
--- a/target/product/base_system.mk
+++ b/target/product/base_system.mk
@@ -281,6 +281,12 @@
     system_manifest.xml \
     system_compatibility_matrix.xml \
 
+# HWASAN runtime for SANITIZE_TARGET=hwaddress builds
+ifneq (,$(filter hwaddress,$(SANITIZE_TARGET)))
+  PRODUCT_PACKAGES += \
+   libclang_rt.hwasan-aarch64-android.bootstrap
+endif
+
 # Host tools to install
 PRODUCT_HOST_PACKAGES += \
     BugReport \

target/product/runtime_libart.mk

diff --git a/target/product/runtime_libart.mk b/target/product/runtime_libart.mk
index 1bd2af7..7633abe 100644
--- a/target/product/runtime_libart.mk
+++ b/target/product/runtime_libart.mk
@@ -92,8 +92,4 @@
     dalvik.vm.minidebuginfo=true \
     dalvik.vm.dex2oat-minidebuginfo=true
 
-# Enable iorapd by default
-PRODUCT_SYSTEM_PROPERTIES += \
-    ro.iorapd.enable=true
-
 PRODUCT_USES_DEFAULT_ART_CONFIG := true