diff options
| author | Kiyoung Kim <kiyoungkim@google.com> | 2020-06-17 06:31:23 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-17 06:31:23 +0000 |
| commit | db154ef3252f9fd9c95d8ba5ed54529a3bfd9794 (patch) | |
| tree | 4a64bee51a00fca42f91d456d205d45a7db7cd37 | |
| parent | 1669f5b26ee405c5c1e9f858f9fcb9149c32e37e (diff) | |
| parent | 86a0d1a8b6666a663628902237e22c820278f1ce (diff) | |
| download | linkerconfig-android-mainline-11.0.0_r34.tar.gz | |
Add extra search paths from unrestricted section am: 86a0d1a8b6android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android11-mainline-tethering-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-release
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/linkerconfig/+/11834813
Change-Id: I98aa6452af3bd96167c6ec874ae4f0bda1a7f59e
| -rw-r--r-- | contents/namespace/unrestricteddefault.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/contents/namespace/unrestricteddefault.cc b/contents/namespace/unrestricteddefault.cc index 3cfa6c3..b6186ba 100644 --- a/contents/namespace/unrestricteddefault.cc +++ b/contents/namespace/unrestricteddefault.cc @@ -30,8 +30,10 @@ Namespace BuildUnrestrictedDefaultNamespace([[maybe_unused]] const Context& ctx) Namespace ns("default", /*is_isolated=*/false, /*is_visible=*/true); ns.AddSearchPath("/system/${LIB}", AsanPath::WITH_DATA_ASAN); + ns.AddSearchPath(Var("SYSTEM_EXT") + "/${LIB}", AsanPath::WITH_DATA_ASAN); ns.AddSearchPath("/odm/${LIB}", AsanPath::WITH_DATA_ASAN); ns.AddSearchPath("/vendor/${LIB}", AsanPath::WITH_DATA_ASAN); + ns.AddSearchPath(Var("PRODUCT") + "/${LIB}", AsanPath::WITH_DATA_ASAN); ns.AddRequires(std::vector{ // Keep in sync with the "platform" namespace in art/build/apex/ld.config.txt. |