diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-04-04 02:09:19 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2020-04-04 02:09:19 +0000 |
| commit | 0c09ea1ddc250b2b1043783543d83fbb1fd5aa86 (patch) | |
| tree | 7d0a63623d255fa6785e35af9825e483810d82ce | |
| parent | 4a0e12a1d852a000eb526c75f7572b8a4669f7fa (diff) | |
| parent | 97486985ed21929a7562443f839068cdbe1c7170 (diff) | |
| download | linkerconfig-0c09ea1ddc250b2b1043783543d83fbb1fd5aa86.tar.gz | |
Snap for 6362488 from 97486985ed21929a7562443f839068cdbe1c7170 to rvc-d1-release
Change-Id: I3ae742111c07e177635a20b019f984fec23954f4
| -rw-r--r-- | contents/namespace/sphal.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/contents/namespace/sphal.cc b/contents/namespace/sphal.cc index 07bf2a8..2627788 100644 --- a/contents/namespace/sphal.cc +++ b/contents/namespace/sphal.cc @@ -44,15 +44,19 @@ Namespace BuildSphalNamespace([[maybe_unused]] const Context& ctx) { ns.AddPermittedPath("/vendor/${LIB}", AsanPath::WITH_DATA_ASAN); ns.AddPermittedPath("/system/vendor/${LIB}", AsanPath::NONE); + if (ctx.IsApexBinaryConfig() && !ctx.IsVndkAvailable()) { + // If device is legacy, let Sphal libraries access to system lib path for + // VNDK-SP libraries + ns.AddSearchPath("/system/${LIB}", AsanPath::WITH_DATA_ASAN); + ns.AddPermittedPath("/system/${LIB}", AsanPath::WITH_DATA_ASAN); + } + if (ctx.IsApexBinaryConfig()) { if (ctx.IsVndkAvailable()) { ns.GetLink("vndk").AddSharedLib( Var("VNDK_SAMEPROCESS_LIBRARIES_VENDOR", "")); ns.GetLink(ctx.GetSystemNamespaceName()) .AddSharedLib(Var("LLNDK_LIBRARIES_VENDOR", "")); - } else { - // Add a link for libz.so which is llndk on devices where VNDK is not enforced. - ns.GetLink(ctx.GetSystemNamespaceName()).AddSharedLib("libz.so"); } } else { // Once in this namespace, access to libraries in /system/lib is restricted. |