OSDN Git Service

android-x86/system-linkerconfig.git
3 years agoMerge "LOG on failure to access VNDK APEX during linkerconfig variable loading."
Treehugger Robot [Thu, 22 Apr 2021 08:00:01 +0000 (08:00 +0000)]
Merge "LOG on failure to access VNDK APEX during linkerconfig variable loading."

3 years agoLOG on failure to access VNDK APEX during linkerconfig variable loading.
Daniel Norman [Tue, 13 Apr 2021 22:49:45 +0000 (22:49 +0000)]
LOG on failure to access VNDK APEX during linkerconfig variable loading.

This should help expose a previously-silent error that leads to missing
linkerconfig variables.

Bug: b/169420191#comment6
Change-Id: I202ecf19a1a594c78650fef47f49b0b62fef5a1a

3 years agoMerge "Add doc about linker.config.pb"
Jooyung Han [Thu, 15 Apr 2021 02:22:17 +0000 (02:22 +0000)]
Merge "Add doc about linker.config.pb"

3 years agoAdd doc about linker.config.pb
Jooyung Han [Wed, 14 Apr 2021 18:12:07 +0000 (03:12 +0900)]
Add doc about linker.config.pb

Since there's no mention about linker.config.pb, one may get confused
they want to find the artifact from the device.

Especially, /system/etc/linker.config.pb is not just compiled into .pb,
but is amended during "make" to populated(or append) "provideLibs" key
at make phase.

Because /system/etc/linker.config.pb is a very crucial part of the
system, it deserves more explanation.

Bug: n/a
Test: documentation
Change-Id: Ib6db77a42ec842ab0ecea15a44f9557345b57a58

3 years agoMerge "Remove hardcoded requires from the ART APEX default namespace."
Martin Stjernholm [Wed, 14 Apr 2021 12:29:59 +0000 (12:29 +0000)]
Merge "Remove hardcoded requires from the ART APEX default namespace."

3 years agoRemove hardcoded requires from the ART APEX default namespace.
Martin Stjernholm [Tue, 13 Apr 2021 15:44:18 +0000 (16:44 +0100)]
Remove hardcoded requires from the ART APEX default namespace.

It should get the links from the manifest, just like in the
com_android_art namespace.

Test: system/linkerconfig/rundiff.sh
Bug: 147082642
Change-Id: Id5789e69bede78dea60e952a1cd95f8ec0de8730

3 years agoAdd default value("") for SANITIZER_RUNTIME_LIBRARIES
Jooyung Han [Tue, 13 Apr 2021 07:10:30 +0000 (16:10 +0900)]
Add default value("") for SANITIZER_RUNTIME_LIBRARIES

Without the default value set, linkerconfig fails when generating
configs for apexes.

Bug: 185199923
Test: linkerconfig runs in microdroid
Change-Id: I0697f332fb816b63230c621c96ddec56e71e7727

3 years agolibdexfile_external is replaced by libdexfile (reland).
Martin Stjernholm [Thu, 18 Mar 2021 03:13:52 +0000 (03:13 +0000)]
libdexfile_external is replaced by libdexfile (reland).

Only update the test data to avoid confusing discrepancy.

This relands https://r.android.com/1643427 after decoupling it from the
topic that caused b/184239856.

Test: system/linkerconfig/rundiff.sh
Bug: 143978909
Change-Id: I1ca20568a77c4487e815bbfa32f108964bed00a4

3 years agoRevert "libdexfile_external is replaced by libdexfile."
Nikita Ioffe [Thu, 1 Apr 2021 10:58:24 +0000 (10:58 +0000)]
Revert "libdexfile_external is replaced by libdexfile."

Revert "Rename libdexfile_external_static to libdexfile_static."

Revert "Rename libdexfile_external_static to libdexfile_static."

Revert "Allow dependencies from platform variants to APEX modules."

Revert submission 1658000

Reason for revert: Breaks full-eng build: b/184239856
Reverted Changes:
I4f8ead785:Avoid internal APEX stubs for libsigchain and clea...
I68affdf69:Allow dependencies from platform variants to APEX ...
I54b33784e:Rename libdexfile_external_static to libdexfile_st...
Id68ae9438:libdexfile_external is being replaced by libdexfil...
I12ac84eb4:libdexfile_external is replaced by libdexfile.
If05dbffc8:Rename libdexfile_external_static to libdexfile_st...
Ia011fa3a8:Merge libdexfile_external into libdexfile.

Change-Id: Iab9f8b5b839eb0c3ade2019bf7af579cccae81d9

3 years agolibdexfile_external is replaced by libdexfile.
Martin Stjernholm [Thu, 18 Mar 2021 03:13:52 +0000 (03:13 +0000)]
libdexfile_external is replaced by libdexfile.

Only update the test data to avoid confusing discrepancy.

Test: system/linkerconfig/rundiff.sh
Bug: 143978909
Change-Id: I12ac84eb41d461d1607b0c3b45be58dccdb78460

3 years agoAdd libneuralnetworks_shim.so to be visible by vendor processes.
Przemysław Szczepaniak [Wed, 10 Feb 2021 17:46:41 +0000 (17:46 +0000)]
Add libneuralnetworks_shim.so to be visible by vendor processes.

Test: Run sample vendor service on cf device
Bug: 172925288
Change-Id: Ieaafe94fe2ebf39e9e326a65d394c81f49c1f403
(cherry picked from commit c0a452718689cadffd7469133e0728f9e3f65d9f)

3 years agoMark ab/7061308 as merged in stage.
Xin Li [Sat, 20 Feb 2021 08:24:40 +0000 (00:24 -0800)]
Mark ab/7061308 as merged in stage.

Bug: 180401296
Merged-In: I25413a905b3bb8802278397da89432ad70b60a3e
Change-Id: Id2b763fa5b36294a46bc3d8c65ca03a1220e2ab0

3 years ago[LSC] Add LOCAL_LICENSE_KINDS to system/linkerconfig am: 2da5198851
Bob Badour [Fri, 5 Feb 2021 20:23:32 +0000 (20:23 +0000)]
[LSC] Add LOCAL_LICENSE_KINDS to system/linkerconfig am: 2da5198851

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1576100

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I75dfbb8edfcd02dcd0fd739a9944ec5f35d6eb63

3 years ago[LSC] Add LOCAL_LICENSE_KINDS to system/linkerconfig
Bob Badour [Thu, 4 Feb 2021 06:30:12 +0000 (22:30 -0800)]
[LSC] Add LOCAL_LICENSE_KINDS to system/linkerconfig

Added SPDX-license-identifier-Apache-2.0 to:
  Android.bp
  testmodules/Android.bp
  testmodules/vndkext/Android.bp
  testmodules/vndkext/HelloActivityProduct/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all

Exempt-From-Owner-Approval: janitorial work
Change-Id: I9c01ac44b3a69eb6bfa8a0022ece238456227b6b

3 years agoVerify extra paths from APEX linker config am: c502af5b9c
Kiyoung Kim [Thu, 21 Jan 2021 01:10:47 +0000 (01:10 +0000)]
Verify extra paths from APEX linker config am: c502af5b9c

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1518016

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I87fbc63afa5b3c04e67fb938d9b1e814dc44f6f2

3 years agoVerify extra paths from APEX linker config
Kiyoung Kim [Tue, 8 Dec 2020 07:17:50 +0000 (16:17 +0900)]
Verify extra paths from APEX linker config

Extra paths from APEX linker config cannot be verified from linkerconfig
code review. To make sure if path is valid, this change checks if all
extra paths are valid paths.

Bug: 175655717
Test: m -j passed && atest passed
Change-Id: I96740638b240a24a1eafa7def354cc9eebcd15e1

3 years ago[automerger skipped] Add additional vendor lib paths am: 935f98a97b -s ours
Kiyoung Kim [Thu, 17 Dec 2020 21:26:36 +0000 (21:26 +0000)]
[automerger skipped] Add additional vendor lib paths am: 935f98a97b -s ours

am skip reason: Change-Id Icba3ee1744b67d48241a53a147009270b0f550ca with SHA-1 86bc987a32 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/linkerconfig/+/13239085

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25413a905b3bb8802278397da89432ad70b60a3e

3 years agoAdd additional vendor lib paths
Kiyoung Kim [Mon, 12 Oct 2020 01:30:03 +0000 (10:30 +0900)]
Add additional vendor lib paths

Some of the vendor lib paths were removed from VNDK 28 due to no usage.
However, Vulkan team requires those vendor lib paths from vendor
section to load SPHAL libraries. To enable this, this change re-adds
addtional vendor lib paths (hw and egl) to vendor default namespace.

Bug: 170258171
Bug: 172267984
Test: atest passed

Merged-In: I85fa6fa6f61d5559c5498163302a99741f6f733f
Merged-In: Icba3ee1744b67d48241a53a147009270b0f550ca
Merged-In: Ifb0a6d2085aefb2729e3c28ab7022d38a3786a38
Change-Id: I85fa6fa6f61d5559c5498163302a99741f6f733f
(cherry picked from commit 7bbcf7ef3738c1c519381a338568faf2358f2a03)

3 years agoDo not fail on missing public.libraries.txt am: 6c7494c780 am: 31932d1ac5
Kiyoung Kim [Wed, 16 Dec 2020 14:06:53 +0000 (14:06 +0000)]
Do not fail on missing public.libraries.txt am: 6c7494c780 am: 31932d1ac5

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1531360

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14712faa5e3bf382c9fbbfd8d7f06d09ac0867e8

3 years agoDo not fail on missing public.libraries.txt am: 6c7494c780
Kiyoung Kim [Wed, 16 Dec 2020 13:33:47 +0000 (13:33 +0000)]
Do not fail on missing public.libraries.txt am: 6c7494c780

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1531360

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If41c9dd844a6e168f15b8db4fdb6c9ebd7784aa7

3 years agoDo not fail on missing public.libraries.txt
Kiyoung Kim [Wed, 16 Dec 2020 02:51:39 +0000 (11:51 +0900)]
Do not fail on missing public.libraries.txt

public.libraries.txt can be omitted from the environment without ART. To
keep linkerconfig work from this environment, missing
public.libraries.txt should not fail.

Bug: 175734213
Test: cuttlefish build and boot succeeded
Change-Id: I0ee9f0dd5dfd739be055cbfa0248e5eca404045a

3 years agoRemove unused variable am: cf2a7e754d am: 8f36131d9f
Kiyoung Kim [Mon, 14 Dec 2020 03:18:42 +0000 (03:18 +0000)]
Remove unused variable am: cf2a7e754d am: 8f36131d9f

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1520662

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0920d592cf78be6121a3ede9365b6a32f883a8ab

3 years agoRemove unused variable am: cf2a7e754d
Kiyoung Kim [Mon, 14 Dec 2020 03:02:09 +0000 (03:02 +0000)]
Remove unused variable am: cf2a7e754d

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1520662

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5c0c0a7bf5ddf82858924c6be13ab3d78a6d901f

3 years agoRemove unused variable
Kiyoung Kim [Wed, 9 Dec 2020 04:36:44 +0000 (13:36 +0900)]
Remove unused variable

Remove library list variable which now gets from linker.config.pb from
the source code.

Test: Cuttlefish boot succeeded
Change-Id: Id667a64857e3818e5b148b4366bc98755e160c4e

3 years agoMerge "Refactor ScanActiveApexes to return android::base::Result" am: a162d8b156...
Kiyoung Kim [Wed, 9 Dec 2020 08:37:59 +0000 (08:37 +0000)]
Merge "Refactor ScanActiveApexes to return android::base::Result" am: a162d8b156 am: 0d6ba5eb82

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1520657

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ice0038f914a3d9c2f092bc1545513286c7da2af1

3 years agoMerge "Refactor ScanActiveApexes to return android::base::Result" am: a162d8b156
Kiyoung Kim [Wed, 9 Dec 2020 08:21:35 +0000 (08:21 +0000)]
Merge "Refactor ScanActiveApexes to return android::base::Result" am: a162d8b156

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1520657

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7fef3f0973d67a0546a5030059db82ef041701bc

3 years agoMerge "Refactor ScanActiveApexes to return android::base::Result"
Kiyoung Kim [Wed, 9 Dec 2020 07:53:35 +0000 (07:53 +0000)]
Merge "Refactor ScanActiveApexes to return android::base::Result"

3 years agoRefactor ScanActiveApexes to return android::base::Result
Kiyoung Kim [Tue, 8 Dec 2020 07:14:57 +0000 (16:14 +0900)]
Refactor ScanActiveApexes to return android::base::Result

ScanActiveApexes returns list of active APEX modules directly, so it is
difficult to get any status or reason of failure from callers. This
change refactors the function into android::base::Result for better
error handling.

Test: Cuttlefish boot succeded && atest passed
Change-Id: I3f3368e8ee21f8bda1df73b5d1751340656deac7

3 years agoMove linkerconfig to Runtime APEX am: b164506948 am: 945292ed9e
Kiyoung Kim [Fri, 4 Dec 2020 01:51:12 +0000 (01:51 +0000)]
Move linkerconfig to Runtime APEX am: b164506948 am: 945292ed9e

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1512741

Change-Id: I3fdff16b3fe7997386de4493e708f7777fbdcd14

3 years agoMove linkerconfig to Runtime APEX am: b164506948
Kiyoung Kim [Fri, 4 Dec 2020 01:35:37 +0000 (01:35 +0000)]
Move linkerconfig to Runtime APEX am: b164506948

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1512741

Change-Id: Ic4987ac42473d25f7209e79825b99f856d9c4e98

3 years agoRemove reference between linkerconfig and system_linker_config am: 0c857f4c79 am...
Kiyoung Kim [Wed, 2 Dec 2020 02:04:03 +0000 (02:04 +0000)]
Remove reference between linkerconfig and system_linker_config am: 0c857f4c79 am: fcbcfec5c6

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1512810

Change-Id: I90a57011d312fd77eecf4f93163f2738ab61f810

3 years agoRemove reference between linkerconfig and system_linker_config am: 0c857f4c79
Kiyoung Kim [Wed, 2 Dec 2020 01:45:18 +0000 (01:45 +0000)]
Remove reference between linkerconfig and system_linker_config am: 0c857f4c79

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1512810

Change-Id: I876220a52846ab3f4b128bfd78c5df7365b783e4

3 years agoMove linkerconfig to Runtime APEX
Kiyoung Kim [Mon, 30 Nov 2020 05:58:47 +0000 (14:58 +0900)]
Move linkerconfig to Runtime APEX

Move linkerconfig to Runtime APEX for better updatability. linkerconfig
shared ld.config.txt format with linker, so it is better that linker and
linkerconfig to be updated together. This change moves linkerconfig into
Runtime APEX.

Bug: 165769179
Test: Cuttlefish boot succeeded
Change-Id: I17bf95345a6e99813275325589bfe4b4cd8e1e4e

3 years agoRemove reference between linkerconfig and system_linker_config
Kiyoung Kim [Fri, 27 Nov 2020 04:23:34 +0000 (13:23 +0900)]
Remove reference between linkerconfig and system_linker_config

system_linker_config will be handled from Makefile and dependency also
will be handled from Makefile directly. As dependency from linkerconfig
is no longer required, this change removes system_linker_config from
linkerconfig's required modules.

Bug: 172889962
Test: Build cuttlefish and confirmed list is generated in
/system/etc/linker.config.pb

Change-Id: I3c84064dcb478c0fc26bf906f80101baf5342f3b

3 years agoRename sharedApexLibs to requireSharedApexLibs am: 4a5be61b6f am: b61f10d0b5
Kiyoung Kim [Wed, 25 Nov 2020 00:14:10 +0000 (00:14 +0000)]
Rename sharedApexLibs to requireSharedApexLibs am: 4a5be61b6f am: b61f10d0b5

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1508157

Change-Id: I36ba389f6c68e2ef89b8bd6b81279fa18a7c6187

3 years agoRename sharedApexLibs to requireSharedApexLibs am: 4a5be61b6f
Kiyoung Kim [Tue, 24 Nov 2020 23:58:15 +0000 (23:58 +0000)]
Rename sharedApexLibs to requireSharedApexLibs am: 4a5be61b6f

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1508157

Change-Id: Ie0efca2a1c053e5e7e9290bd4a8d995a755aceda

3 years agoMark ab/6881855 as merged am: e0d298e5ba
Xin Li [Tue, 24 Nov 2020 00:25:54 +0000 (00:25 +0000)]
Mark ab/6881855 as merged am: e0d298e5ba

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/linkerconfig/+/13113122

Change-Id: I7175a53412b9cc88f45ff69721b575ddc60d5af2

3 years agoMark ab/6881855 as merged
Xin Li [Mon, 23 Nov 2020 19:32:59 +0000 (11:32 -0800)]
Mark ab/6881855 as merged

Bug: 172690556
Change-Id: Id0e0a2a67972840a1cdd57cf3d08620ac220a2b4

3 years agoRename sharedApexLibs to requireSharedApexLibs
Kiyoung Kim [Mon, 23 Nov 2020 07:33:56 +0000 (16:33 +0900)]
Rename sharedApexLibs to requireSharedApexLibs

sharedApexLibs property from APEX manifest can be confused as there is a
property named provideSharedApexLibs. Rename sharedApexLibs to
requireSharedApexLibs for better readability.

Bug: 161542925
Test: m -j && atest sharedlibs_host_tests passed
Change-Id: Ib2bd408e13fc81f90f68a822b101e148dd1c401f

3 years agoUpdate path for SharedLibs APEX am: 48fbb64f90 am: def65b9848 am: fa40ca0f0a
Kiyoung Kim [Thu, 19 Nov 2020 17:10:41 +0000 (17:10 +0000)]
Update path for SharedLibs APEX am: 48fbb64f90 am: def65b9848 am: fa40ca0f0a

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1501911

Change-Id: Ic30e97bbd6495a9acd5f9619c2e128cb7069f8d5

3 years agoUpdate path for SharedLibs APEX am: 48fbb64f90 am: def65b9848
Kiyoung Kim [Thu, 19 Nov 2020 16:42:29 +0000 (16:42 +0000)]
Update path for SharedLibs APEX am: 48fbb64f90 am: def65b9848

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1501911

Change-Id: I3a15315ec8f2c69a08d19aba4b6c178e1be63c2f

3 years agoUpdate path for SharedLibs APEX am: 48fbb64f90
Kiyoung Kim [Thu, 19 Nov 2020 16:29:24 +0000 (16:29 +0000)]
Update path for SharedLibs APEX am: 48fbb64f90

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1501911

Change-Id: Ib1e5be8d87a5d2e8e20c08797b4f8f55dd172917

3 years agoUpdate path for SharedLibs APEX
Kiyoung Kim [Tue, 17 Nov 2020 14:16:34 +0000 (23:16 +0900)]
Update path for SharedLibs APEX

Update path for SharedLibs APEX so any mounted SharedLibs APEX can be
included in the permitted path.

Bug: 161542925
Test: foo_test and bar_test execution succeeded
Change-Id: I74e248cba4bfba8e3ea8e5c9b5628c665a02b52e

3 years agoMerge "Verify if APEX has any link with all libs allowed" am: 50753513ab am: f61ab6d0...
Kiyoung Kim [Fri, 13 Nov 2020 02:04:25 +0000 (02:04 +0000)]
Merge "Verify if APEX has any link with all libs allowed" am: 50753513ab am: f61ab6d07f am: b2b68e0ea1

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1493796

Change-Id: If65516958774a364e8e0bc4068b4ac19590fa71e

3 years agoMerge "Verify if APEX has any link with all libs allowed" am: 50753513ab am: f61ab6d07f
Kiyoung Kim [Fri, 13 Nov 2020 01:39:35 +0000 (01:39 +0000)]
Merge "Verify if APEX has any link with all libs allowed" am: 50753513ab am: f61ab6d07f

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1493796

Change-Id: I783b3096bd9d3ef1e4ba6737204b491d212078a0

3 years agoMerge "Verify if APEX has any link with all libs allowed" am: 50753513ab
Kiyoung Kim [Fri, 13 Nov 2020 01:33:17 +0000 (01:33 +0000)]
Merge "Verify if APEX has any link with all libs allowed" am: 50753513ab

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1493796

Change-Id: I36e1ab6d9f0bf70a5dd47e8894e75759ba53470a

3 years agoMerge "Verify if APEX has any link with all libs allowed"
Kiyoung Kim [Fri, 13 Nov 2020 01:17:17 +0000 (01:17 +0000)]
Merge "Verify if APEX has any link with all libs allowed"

3 years agoVerify if APEX has any link with all libs allowed
Kiyoung Kim [Tue, 10 Nov 2020 01:46:09 +0000 (10:46 +0900)]
Verify if APEX has any link with all libs allowed

APEX modules should link to other namespaces with exact library list
rather than just allowing all libs to keep track of dependencies. This
change verifies if there are any APEX (except ART) which contains link
with all libs allowed.

Bug: 159302165
Test: atest passed
Change-Id: Ifdd7de179f8d420ec548b8ab11fcd137ceb1a3aa

3 years agoJNI libs should be visible to ART namespace am: bd7e51956a am: 120e9c5f4a am: 21e65a5223
Jooyung Han [Thu, 12 Nov 2020 01:51:54 +0000 (01:51 +0000)]
JNI libs should be visible to ART namespace am: bd7e51956a am: 120e9c5f4a am: 21e65a5223

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1489976

Change-Id: I90d761749d734693fa67c02f436173b09903d8a8

3 years agoJNI libs should be visible to ART namespace am: bd7e51956a am: 120e9c5f4a
Jooyung Han [Thu, 12 Nov 2020 01:21:58 +0000 (01:21 +0000)]
JNI libs should be visible to ART namespace am: bd7e51956a am: 120e9c5f4a

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1489976

Change-Id: Ic6802fd543eb3b25909715f018cc0f0fdd36b766

3 years agoJNI libs should be visible to ART namespace am: bd7e51956a
Jooyung Han [Thu, 12 Nov 2020 01:04:41 +0000 (01:04 +0000)]
JNI libs should be visible to ART namespace am: bd7e51956a

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1489976

Change-Id: I2ade1f468c35d2fd1697f60f19668952d91cf609

3 years agoJNI libs should be visible to ART namespace
Jooyung Han [Fri, 6 Nov 2020 01:18:03 +0000 (10:18 +0900)]
JNI libs should be visible to ART namespace

JNI libs from apexes should be visible for libnativeloader to load them.

Bug: 172541385
Bug: 150767721
Bug: 172689934
Test: linkerconfig_diff_test
Test: loading jni libs from apexes
Change-Id: Ie6cd53fb0aef78132dccc4398270884f4455804b

3 years agoMerge "Get system's required/providing libraries from config file" am: 1f3adaab26...
Kiyoung Kim [Tue, 10 Nov 2020 07:12:01 +0000 (07:12 +0000)]
Merge "Get system's required/providing libraries from config file" am: 1f3adaab26 am: 6ecd84424c am: f6c3dee18d

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1468862

Change-Id: I710d013ac0086156025a6fcc7808ac1ba2816fb6

3 years agoMerge "Get system's required/providing libraries from config file" am: 1f3adaab26...
Kiyoung Kim [Tue, 10 Nov 2020 06:51:05 +0000 (06:51 +0000)]
Merge "Get system's required/providing libraries from config file" am: 1f3adaab26 am: 6ecd84424c

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1468862

Change-Id: Ic909fa27fd93ecac1768b890a0f85179e179381f

3 years agoMerge "Get system's required/providing libraries from config file" am: 1f3adaab26
Kiyoung Kim [Tue, 10 Nov 2020 06:08:52 +0000 (06:08 +0000)]
Merge "Get system's required/providing libraries from config file" am: 1f3adaab26

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1468862

Change-Id: Ica7fca75f154a0584d5c6e29b06ae5a4f18d6319

3 years agoMerge "Get system's required/providing libraries from config file"
Kiyoung Kim [Tue, 10 Nov 2020 05:49:35 +0000 (05:49 +0000)]
Merge "Get system's required/providing libraries from config file"

3 years ago[automerger skipped] Make statsd APEX visible from ART APEX am: ab2194a76e -s ours
Kiyoung Kim [Fri, 6 Nov 2020 04:11:09 +0000 (04:11 +0000)]
[automerger skipped] Make statsd APEX visible from ART APEX am: ab2194a76e -s ours

am skip reason: Change-Id Idd7e2b0bcc6e54cd79c2b9c4c755f883b4507b74 with SHA-1 52ccfa77b7 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/linkerconfig/+/12974501

Change-Id: I9e00c16d0680e1c62c6c781d84afb311b470113d

3 years agoAdd support for test common APEX am: 180ec044ba am: b97f67000f am: 3ac2884b66
Kiyoung Kim [Tue, 3 Nov 2020 09:31:54 +0000 (09:31 +0000)]
Add support for test common APEX am: 180ec044ba am: b97f67000f am: 3ac2884b66

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1479617

Change-Id: Ief3227dc08e9084621431b7bbe4195698973a679

3 years agoAdd support for test common APEX am: 180ec044ba am: b97f67000f
Kiyoung Kim [Tue, 3 Nov 2020 09:15:56 +0000 (09:15 +0000)]
Add support for test common APEX am: 180ec044ba am: b97f67000f

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1479617

Change-Id: Ie735dc6d6c20cdd6b8edfd28f81f5ca6f72dc40a

3 years agoAdd support for test common APEX am: 180ec044ba
Kiyoung Kim [Tue, 3 Nov 2020 09:02:47 +0000 (09:02 +0000)]
Add support for test common APEX am: 180ec044ba

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1479617

Change-Id: I66f02db27d9f5283365abb8d5e533492fb5fad10

3 years agoMake statsd APEX visible from ART APEX
Kiyoung Kim [Tue, 3 Nov 2020 07:30:21 +0000 (16:30 +0900)]
Make statsd APEX visible from ART APEX

Make statsd APEX visible from ART APEX so statsd APEX namespace is
available from libnativeloader.

Bug: 172284673
Test: m -j passed && crosshatch boot succeeded
Change-Id: I202be84f9fc75b0aadda145d047dc57ac17b7d4a
Merged-In: Idd7e2b0bcc6e54cd79c2b9c4c755f883b4507b74

3 years agoAdd support for test common APEX
Kiyoung Kim [Fri, 30 Oct 2020 06:36:12 +0000 (15:36 +0900)]
Add support for test common APEX

Add linkerconfig support for test common APEX. This change will add
extra permitted path to (test) common APEX when there is any library
referenced from the APEX module.

Bug: 161542925
Test: SharedLibsApexTest passed from crosshatch
Change-Id: I19813f72c251ae3e4a2b820ce52b33c9dbcfae6f

3 years agoGet system's required/providing libraries from config file
Kiyoung Kim [Wed, 21 Oct 2020 00:59:12 +0000 (09:59 +0900)]
Get system's required/providing libraries from config file

Currently most of system dependent libraries are listed in the source
code. To remove dependency between system image and linkerconfig, this
change makes linkerconfig to get those library list from configuration
file under /system/etc.

Bug: 168262631
Test: atest passed
Test: cuttlefish & crosshatch boot succeeded
Change-Id: I21653fb58d69417eda6c676f9dcb9b44e0ad764a

3 years agoUse LinkerConfig object directly am: e9dc6c195d am: ee1e941543 am: 53e337fd32
Kiyoung Kim [Thu, 22 Oct 2020 07:54:29 +0000 (07:54 +0000)]
Use LinkerConfig object directly am: e9dc6c195d am: ee1e941543 am: 53e337fd32

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1465987

Change-Id: I53436c91556e28f9a606064096babff2233fcb7e

3 years agoUse LinkerConfig object directly am: e9dc6c195d am: ee1e941543
Kiyoung Kim [Thu, 22 Oct 2020 07:21:10 +0000 (07:21 +0000)]
Use LinkerConfig object directly am: e9dc6c195d am: ee1e941543

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1465987

Change-Id: I0882a7f99f0326fae6fd39de251396dc2bac720b

3 years agoUse LinkerConfig object directly am: e9dc6c195d
Kiyoung Kim [Thu, 22 Oct 2020 06:33:05 +0000 (06:33 +0000)]
Use LinkerConfig object directly am: e9dc6c195d

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1465987

Change-Id: Icc299cc43c1f05951b3e20809e96468bd8f3d3d3

3 years agoUse LinkerConfig object directly
Kiyoung Kim [Wed, 21 Oct 2020 08:44:25 +0000 (17:44 +0900)]
Use LinkerConfig object directly

Last implementation on ApexInfo requires multiple copy of LinkerConfig
contents. To reduce number of information copy, this change makes
ApexInfo to use LinkerConfig object directly rather than copying
information.

Bug: 169634881
Test: atest passed
Change-Id: Ic1a0f58d3eecb2a5cde710bdda65e89b08d7d4ff

3 years agoMerge "Add extra dependencies for system namespace" am: 513ff1223c am: fbefde2ea7...
Kiyoung Kim [Tue, 20 Oct 2020 20:28:50 +0000 (20:28 +0000)]
Merge "Add extra dependencies for system namespace" am: 513ff1223c am: fbefde2ea7 am: 24060fb4de

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1463582

Change-Id: I5f09e7c11b997d91fe335dd532148a8f9bf96518

3 years agoMerge "Update configuration for linkerconfig as json/protobuf" am: aff10d85e8 am...
Kiyoung Kim [Tue, 20 Oct 2020 20:22:23 +0000 (20:22 +0000)]
Merge "Update configuration for linkerconfig as json/protobuf" am: aff10d85e8 am: 21c45b290f am: 23a7684387

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1450475

Change-Id: I856d918844fd4abcc1a203606a28c2d4c9c8e416

3 years agoMerge "Add extra dependencies for system namespace" am: 513ff1223c am: fbefde2ea7
Kiyoung Kim [Tue, 20 Oct 2020 19:41:11 +0000 (19:41 +0000)]
Merge "Add extra dependencies for system namespace" am: 513ff1223c am: fbefde2ea7

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1463582

Change-Id: I294f75db97d5b89f1be2e5e751f343d7b25163b1

3 years agoMerge "Update configuration for linkerconfig as json/protobuf" am: aff10d85e8 am...
Kiyoung Kim [Tue, 20 Oct 2020 19:38:09 +0000 (19:38 +0000)]
Merge "Update configuration for linkerconfig as json/protobuf" am: aff10d85e8 am: 21c45b290f

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1450475

Change-Id: Ic5075fd68538e35d00283201ae0d94f7b88906f5

3 years agoMerge "Add extra dependencies for system namespace" am: 513ff1223c
Kiyoung Kim [Tue, 20 Oct 2020 19:18:12 +0000 (19:18 +0000)]
Merge "Add extra dependencies for system namespace" am: 513ff1223c

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1463582

Change-Id: Ie468bd46f0e4e9e6a5c1d76be4552eba74a707e4

3 years agoMerge "Update configuration for linkerconfig as json/protobuf" am: aff10d85e8
Kiyoung Kim [Tue, 20 Oct 2020 19:08:22 +0000 (19:08 +0000)]
Merge "Update configuration for linkerconfig as json/protobuf" am: aff10d85e8

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1450475

Change-Id: I0dd06f7b2a75cd5840dd914b755f5fab9d6a9e44

3 years agoMerge "Add extra dependencies for system namespace"
Kiyoung Kim [Tue, 20 Oct 2020 00:25:12 +0000 (00:25 +0000)]
Merge "Add extra dependencies for system namespace"

3 years agoMerge "Update configuration for linkerconfig as json/protobuf"
Kiyoung Kim [Tue, 20 Oct 2020 00:23:58 +0000 (00:23 +0000)]
Merge "Update configuration for linkerconfig as json/protobuf"

3 years agoAdd extra dependencies for system namespace
Kiyoung Kim [Fri, 16 Oct 2020 05:05:53 +0000 (14:05 +0900)]
Add extra dependencies for system namespace

Add extra dependencies between system namespace and Statsd APEX so
system namespace from non-system section can use libraries from statsd
APEX.

Bug: 170695190
Test: Cuttlefish boot succeeded
Change-Id: I512e1cd6731a7f31121f408ff6a2405275b136e0

3 years agoUpdate configuration for linkerconfig as json/protobuf
Kiyoung Kim [Tue, 6 Oct 2020 08:07:25 +0000 (17:07 +0900)]
Update configuration for linkerconfig as json/protobuf

Current configuration format is ini-like format which is not fully
defined so less extensible. This change updates configuration format
with json, and convert into protobuf which can be parsed easily at
runtime.

Bug: 169634881
Test: atest passed && cuttlefish boot succeeded
Change-Id: I818193e50e7fd33001ecdb2189c4e3d819bd4d7b

3 years agoMerge "Add additional vendor lib paths" am: 0f834e6f21 am: 81feb08771 am: 44556300e2
Kiyoung Kim [Wed, 14 Oct 2020 01:35:42 +0000 (01:35 +0000)]
Merge "Add additional vendor lib paths" am: 0f834e6f21 am: 81feb08771 am: 44556300e2

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1456322

Change-Id: Icba3ee1744b67d48241a53a147009270b0f550ca

3 years agoMerge "Add additional vendor lib paths" am: 0f834e6f21 am: 81feb08771
Kiyoung Kim [Wed, 14 Oct 2020 01:24:01 +0000 (01:24 +0000)]
Merge "Add additional vendor lib paths" am: 0f834e6f21 am: 81feb08771

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1456322

Change-Id: I40a4c44572d458ac74164de2975bd07b0ba82ee2

3 years agoMerge "Add additional vendor lib paths" am: 0f834e6f21
Kiyoung Kim [Wed, 14 Oct 2020 01:12:06 +0000 (01:12 +0000)]
Merge "Add additional vendor lib paths" am: 0f834e6f21

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1456322

Change-Id: I1a04d040702092bf6c365f2c600a19e6bce9b71c

3 years agoMerge "Add additional vendor lib paths"
Kiyoung Kim [Wed, 14 Oct 2020 00:37:46 +0000 (00:37 +0000)]
Merge "Add additional vendor lib paths"

3 years agoLink sanitizer libs from "system" for vendor apex am: 45a2de1ee1 am: d9f194e090 am...
Jooyung Han [Tue, 13 Oct 2020 09:44:44 +0000 (09:44 +0000)]
Link sanitizer libs from "system" for vendor apex am: 45a2de1ee1 am: d9f194e090 am: 3ff553c93f

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1457800

Change-Id: I4a5d25ecbbe60f5d21defea844d570c81008fb77

3 years agoLink sanitizer libs from "system" for vendor apex am: 45a2de1ee1 am: d9f194e090
Jooyung Han [Tue, 13 Oct 2020 09:32:32 +0000 (09:32 +0000)]
Link sanitizer libs from "system" for vendor apex am: 45a2de1ee1 am: d9f194e090

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1457800

Change-Id: Iaa84c6fa5f4b434c18b7a4d5682aa09560d9c9d6

3 years agoLink sanitizer libs from "system" for vendor apex am: 45a2de1ee1
Jooyung Han [Tue, 13 Oct 2020 09:19:49 +0000 (09:19 +0000)]
Link sanitizer libs from "system" for vendor apex am: 45a2de1ee1

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1457800

Change-Id: If8a5ccb0a626579e3c024ad7764645714f744131

3 years agoLink sanitizer libs from "system" for vendor apex
Jooyung Han [Tue, 13 Oct 2020 05:12:55 +0000 (14:12 +0900)]
Link sanitizer libs from "system" for vendor apex

There are two kinds of sanitizer libs.
- vndkcore libs
- system libs

Vendor modules should be able to use sanitizer libs from "system"
namespace. (Note that VNDK sanitizer libs are avialable from "vndk").

Bug: 170672395
Test: linkerconfig_diff_test
Change-Id: Ib1d5e007d6b6451a30a4009b7ecd06bf748f5e47

3 years agoWorkaround global ThinLTO breakage am: 867b2026c4 am: 0ae79b8b2b am: be5fee8c9d
Yi Kong [Mon, 12 Oct 2020 17:53:59 +0000 (17:53 +0000)]
Workaround global ThinLTO breakage am: 867b2026c4 am: 0ae79b8b2b am: be5fee8c9d

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1456321

Change-Id: I4578b6b8a712be12c684f6059053ba1adb2d2c1c

3 years agoWorkaround global ThinLTO breakage am: 867b2026c4 am: 0ae79b8b2b
Yi Kong [Mon, 12 Oct 2020 17:42:16 +0000 (17:42 +0000)]
Workaround global ThinLTO breakage am: 867b2026c4 am: 0ae79b8b2b

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1456321

Change-Id: I78691599b308021d9ab005bec5c21a17e8e7bd29

3 years agoWorkaround global ThinLTO breakage am: 867b2026c4
Yi Kong [Mon, 12 Oct 2020 17:23:03 +0000 (17:23 +0000)]
Workaround global ThinLTO breakage am: 867b2026c4

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1456321

Change-Id: Ia942f0c81e06f98b953cfa5de6b61199d77850ed

3 years agoAdd additional vendor lib paths
Kiyoung Kim [Mon, 12 Oct 2020 01:30:03 +0000 (10:30 +0900)]
Add additional vendor lib paths

Some of the vendor lib paths were removed from VNDK 28 due to no usage.
However, Vulkan team requires those vendor lib paths from vendor
section to load SPHAL libraries. To enable this, this change re-adds
addtional vendor lib paths (hw and egl) to vendor default namespace.

Bug: 170258171
Test: atest passed
Change-Id: I85fa6fa6f61d5559c5498163302a99741f6f733f

3 years agoWorkaround global ThinLTO breakage
Yi Kong [Sun, 11 Oct 2020 16:31:18 +0000 (00:31 +0800)]
Workaround global ThinLTO breakage

The device does not boot with global ThinLTO enabled for linkerconfig.
Disable LTO for it to workaround the issue.

Test: GLOBAL_THINLTO=true m
Test: boot
Bug: 170573443
Change-Id: Id5b7e11c2c4b495b6b0da35dc774b60bcd0543af

3 years ago[automerger skipped] Skip ab/6749736 in stage. am: e73587c3ac -s ours am: 577c021c06...
Xin Li [Fri, 9 Oct 2020 04:17:50 +0000 (04:17 +0000)]
[automerger skipped] Skip ab/6749736 in stage. am: e73587c3ac -s ours am: 577c021c06 -s ours

am skip reason: Change-Id Id16b671d66cdbafb655be03edd16564fa36aee22 with SHA-1 71e479cce9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/linkerconfig/+/12797451

Change-Id: I52dfa895bb838a204063417d3e3be1e59f2f6e5a

3 years ago[automerger skipped] Skip ab/6749736 in stage. am: e73587c3ac -s ours
Xin Li [Fri, 9 Oct 2020 03:39:54 +0000 (03:39 +0000)]
[automerger skipped] Skip ab/6749736 in stage. am: e73587c3ac -s ours

am skip reason: Change-Id Id16b671d66cdbafb655be03edd16564fa36aee22 with SHA-1 71e479cce9 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/linkerconfig/+/12797451

Change-Id: Iae646031f23ddfb5304244014af52a2595102ba7

3 years agoSkip ab/6749736 in stage.
Xin Li [Fri, 9 Oct 2020 00:24:02 +0000 (17:24 -0700)]
Skip ab/6749736 in stage.

Merged-In: Id16b671d66cdbafb655be03edd16564fa36aee22
Change-Id: I28da1c789fff49b34462cadefa915bb37b902151

3 years agoAdd dir.system = /product/app/ entry am: 2a62a40819 am: 1381a5e420 am: 20149cb40f...
Jooyung Han [Fri, 18 Sep 2020 01:22:03 +0000 (01:22 +0000)]
Add dir.system = /product/app/ entry am: 2a62a40819 am: 1381a5e420 am: 20149cb40f am: 3a38e92305

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1429849

Change-Id: Ia00f7fcc1ed7c4fecf6e68993cde9082b0e8a3d1

3 years agoAdd dir.system = /product/app/ entry am: 2a62a40819 am: 1381a5e420 am: 20149cb40f
Jooyung Han [Fri, 18 Sep 2020 00:54:37 +0000 (00:54 +0000)]
Add dir.system = /product/app/ entry am: 2a62a40819 am: 1381a5e420 am: 20149cb40f

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1429849

Change-Id: I4dae4cbf2b2cd5390134043c2f341d0eeb14519a

3 years agoAdd dir.system = /product/app/ entry am: 2a62a40819 am: 1381a5e420
Jooyung Han [Fri, 18 Sep 2020 00:13:16 +0000 (00:13 +0000)]
Add dir.system = /product/app/ entry am: 2a62a40819 am: 1381a5e420

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1429849

Change-Id: I7d1fd16f22785ffb0a514cce50e8a4ee48f58bb4

3 years agoAdd dir.system = /product/app/ entry am: 2a62a40819
Jooyung Han [Thu, 17 Sep 2020 23:57:11 +0000 (23:57 +0000)]
Add dir.system = /product/app/ entry am: 2a62a40819

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1429849

Change-Id: I1902b8e94e04c5ebe5905727918931ef183a1b58

3 years agoAdd dir.system = /product/app/ entry
Jooyung Han [Thu, 17 Sep 2020 14:54:13 +0000 (23:54 +0900)]
Add dir.system = /product/app/ entry

This is a fallback for binaries in APKs being launched.

Bug: 160433462
Test: atest --host linkerconfig_diff_test
Change-Id: I3979b22994d7c801952c13d8bbfa013da78b69e2

3 years agoEnable visibility of bionic and media APEX from config am: 06c8f6c3d6 am: 7266d0ec31...
Kiyoung Kim [Wed, 16 Sep 2020 04:43:14 +0000 (04:43 +0000)]
Enable visibility of bionic and media APEX from config am: 06c8f6c3d6 am: 7266d0ec31 am: fd1a52d0ed am: 9b3a09a119

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1423209

Change-Id: I98a2989e3cac94b4606854646af60e585e710038

3 years agoSet APEX namespace as visible am: 81b9f84b50 am: 4c889f483e am: f5600d0d4b am: 02a8d40565
Kiyoung Kim [Wed, 16 Sep 2020 04:43:12 +0000 (04:43 +0000)]
Set APEX namespace as visible am: 81b9f84b50 am: 4c889f483e am: f5600d0d4b am: 02a8d40565

Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/1420728

Change-Id: Id1f5e93e023340f5e8379edf652c63993e51afb9