From a74de868e3dbba80eabe19645d2ac6c373220d4e Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Mon, 28 Oct 2019 21:08:26 +0000 Subject: [PATCH] Revert "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk"""" This reverts commit 97599dbfeeaaae6d21fe4614753ac6198e3f4e2e. Reason for revert: Fix b/143374795 Change-Id: I156a51435af052a3aae405c74f2a37717bdead5f --- contents/namespace/rs.cc | 4 ++-- contents/namespace/vendordefault.cc | 8 +++----- contents/namespace/vndk.cc | 12 ++++++------ 3 files changed, 11 insertions(+), 13 deletions(-) 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 @@ Namespace BuildRsNamespace([[maybe_unused]] const Context& ctx) { 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); 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 @@ Namespace BuildVendorDefaultNamespace([[maybe_unused]] const Context& ctx) { // 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") { 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 @@ Namespace BuildVndkNamespace([[maybe_unused]] const Context& ctx) { 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 @@ Namespace BuildVndkNamespace([[maybe_unused]] const Context& ctx) { 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}"}); -- 2.11.0