commit 4a1fa855af7ac3e1e7eb148bef15d5f1356d1da0
author Android Build Role Account android-build-prod <android-build-team-robot@google.com> Wed Mar 17 10:05:41 2021 +0000
committer Android Build Role Account android-build-prod <android-build-team-robot@google.com> Wed Mar 17 10:05:41 2021 +0000
tree 7b99a028bda6bf8f9a881355769793f71bf57b54
parent d540761d2b2f33d007c01c5f9fea5afea093b352
parent 0f6c229f946dc0e2fb4c8efbbead76547dc77fc5

Snap for 7214043 from 0f6c229f946dc0e2fb4c8efbbead76547dc77fc5 to r-keystone-qcom-release

Change-Id: I5b0edd7fb07d352ff4e6c244926c6ad2f536a8e8

contents/namespace/sphal.cc

diff --git a/contents/namespace/sphal.cc b/contents/namespace/sphal.cc
index e1f83dd..e97197f 100644
--- a/contents/namespace/sphal.cc
+++ b/contents/namespace/sphal.cc
@@ -40,6 +40,7 @@
                /*is_visible=*/true);
   ns.AddSearchPath("/odm/${LIB}", AsanPath::WITH_DATA_ASAN);
   ns.AddSearchPath("/vendor/${LIB}", AsanPath::WITH_DATA_ASAN);
+  ns.AddSearchPath("/vendor/${LIB}/egl", AsanPath::WITH_DATA_ASAN);
   ns.AddSearchPath("/vendor/${LIB}/hw", AsanPath::NONE);
 
   ns.AddPermittedPath("/odm/${LIB}", AsanPath::WITH_DATA_ASAN);

contents/namespace/vendordefault.cc

diff --git a/contents/namespace/vendordefault.cc b/contents/namespace/vendordefault.cc
index 6d56904..b3be200 100644
--- a/contents/namespace/vendordefault.cc
+++ b/contents/namespace/vendordefault.cc
@@ -92,10 +92,8 @@
         AsanPath::SAME_PATH);
   }
 
-  if (ctx.IsDefaultConfig() && GetVendorVndkVersion() == "27") {
-    ns.AddSearchPath("/vendor/${LIB}/hw", AsanPath::WITH_DATA_ASAN);
-    ns.AddSearchPath("/vendor/${LIB}/egl", AsanPath::WITH_DATA_ASAN);
-  }
+  ns.AddSearchPath("/vendor/${LIB}/hw", AsanPath::WITH_DATA_ASAN);
+  ns.AddSearchPath("/vendor/${LIB}/egl", AsanPath::WITH_DATA_ASAN);
 
   ns.AddPermittedPath("/odm", AsanPath::WITH_DATA_ASAN);
   ns.AddPermittedPath("/vendor", AsanPath::WITH_DATA_ASAN);

contents/section/apexart.cc

diff --git a/contents/section/apexart.cc b/contents/section/apexart.cc
index 51b2730..0be6587 100644
--- a/contents/section/apexart.cc
+++ b/contents/section/apexart.cc
@@ -44,6 +44,7 @@
                           "com.android.art",
                           "com.android.conscrypt",
                           "com.android.neuralnetworks",
+                          "com.android.os.statsd",
                       });
 }
 }  // namespace contents