commit 908c05068cde21bc80fa065a4268bc24c93f7104
author Jooyung Han <jooyung@google.com> Fri Oct 18 15:58:55 2019 +0900
committer Jooyung Han <jooyung@google.com> Sat Oct 19 02:33:13 2019 +0900
tree c80c8df76cebcd3145c47db97a9a22f2fcc07c88
parent 1324ac15521720fe76d1463512f9ed5b9e974334

Revert "Revert "Use VNDK APEX instead of /system/lib/vndk""

This reverts commit a98213baf744c0389c4a1bbe85a8f89720f34420.

Bug: 141451661
Test: m && boot (tested with cuttlefish)
Test: atest CtsNNAPITestCases (this failed with original topic)
Change-Id: I8d7f3c0b35430a0e8fc7857deb9536012c5995af

contents/namespace/rs.cc

diff --git a/contents/namespace/rs.cc b/contents/namespace/rs.cc
index e843876..df6e988 100644
--- a/contents/namespace/rs.cc
+++ b/contents/namespace/rs.cc
@@ -27,8 +27,8 @@
 
   ns.AddSearchPath("/odm/${LIB}/vndk-sp", AsanPath::WITH_DATA_ASAN);
   ns.AddSearchPath("/vendor/${LIB}/vndk-sp", AsanPath::WITH_DATA_ASAN);
-  ns.AddSearchPath("/system/${LIB}/vndk-sp-@{VNDK_VER}",
-                   AsanPath::WITH_DATA_ASAN);
+  ns.AddSearchPath("/apex/com.android.vndk.v@{VNDK_VER}/${LIB}",
+                   AsanPath::SAME_PATH);
   ns.AddSearchPath("/odm/${LIB}", AsanPath::WITH_DATA_ASAN);
   ns.AddSearchPath("/vendor/${LIB}", AsanPath::WITH_DATA_ASAN);
 

contents/namespace/vendordefault.cc

diff --git a/contents/namespace/vendordefault.cc b/contents/namespace/vendordefault.cc
index 669f30d..efbfc03 100644
--- a/contents/namespace/vendordefault.cc
+++ b/contents/namespace/vendordefault.cc
@@ -60,15 +60,13 @@
 
   // VNDK-Lite devices require broader access from vendor to system/product partition
   if (is_vndklite) {
-    ns.AddSearchPath("/system/${LIB}/vndk-sp-@{VNDK_VER}",
-                     AsanPath::WITH_DATA_ASAN);
     ns.AddSearchPath("/system/${LIB}", AsanPath::WITH_DATA_ASAN);
     ns.AddSearchPath("/@{SYSTEM_EXT:system_ext}/${LIB}",
                      AsanPath::WITH_DATA_ASAN);
     ns.AddSearchPath("/@{PRODUCT:product}/${LIB}", AsanPath::WITH_DATA_ASAN);
-    // Put /system/lib/vndk at the last search order in vndk_lite for GSI
-    ns.AddSearchPath("/system/${LIB}/vndk-@{VNDK_VER}",
-                     AsanPath::WITH_DATA_ASAN);
+    // Put system vndk at the last search order in vndk_lite for GSI
+    ns.AddSearchPath("/apex/com.android.vndk.v@{VNDK_VER}/${LIB}",
+                     AsanPath::SAME_PATH);
   }
 
   if (ctx.IsDefaultConfig() && GetVendorVndkVersion() == "27") {

contents/namespace/vndk.cc

diff --git a/contents/namespace/vndk.cc b/contents/namespace/vndk.cc
index 026f1ca..2ffeef7 100644
--- a/contents/namespace/vndk.cc
+++ b/contents/namespace/vndk.cc
@@ -33,14 +33,14 @@
 
   ns.AddSearchPath("/odm/${LIB}/vndk-sp", AsanPath::WITH_DATA_ASAN);
   ns.AddSearchPath("/vendor/${LIB}/vndk-sp", AsanPath::WITH_DATA_ASAN);
-  ns.AddSearchPath("/system/${LIB}/vndk-sp-@{VNDK_VER}",
-                   AsanPath::WITH_DATA_ASAN);
+  ns.AddSearchPath("/apex/com.android.vndk.v@{VNDK_VER}/${LIB}",
+                   AsanPath::SAME_PATH);
 
   if (!is_system_section) {
     ns.AddSearchPath("/odm/${LIB}/vndk", AsanPath::WITH_DATA_ASAN);
     ns.AddSearchPath("/vendor/${LIB}/vndk", AsanPath::WITH_DATA_ASAN);
-    ns.AddSearchPath("/system/${LIB}/vndk-@{VNDK_VER}",
-                     AsanPath::WITH_DATA_ASAN);
+    ns.AddSearchPath("/apex/com.android.vndk.v@{VNDK_VER}/${LIB}",
+                     AsanPath::SAME_PATH);
   }
 
   if (is_system_section) {
@@ -52,8 +52,8 @@
       ns.AddPermittedPath("/system/vendor/${LIB}/hw", AsanPath::NONE);
     }
     ns.AddPermittedPath("/system/vendor/${LIB}/egl", AsanPath::NONE);
-    ns.AddPermittedPath("/system/${LIB}/vndk-sp-@{VNDK_VER}/hw",
-                        AsanPath::WITH_DATA_ASAN);
+    ns.AddPermittedPath("/apex/com.android.vndk.v@{VNDK_VER}/${LIB}/hw",
+                        AsanPath::SAME_PATH);
   }
 
   ns.GetLink(ctx.GetSystemNamespaceName()).AddSharedLib({"@{LLNDK_LIBRARIES}"});