OSDN Git Service
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
Kiyoung Kim [Mon, 14 Sep 2020 02:23:00 +0000 (11:23 +0900)]
Enable visibility of bionic and media APEX from config
Enable visibility of bionic and media APEX from their own linker config
file to remove dependency between linkerconfig and other APEX modules.
Bug:
167946001
Test: atest passed
Change-Id: Icd76f2b8b051c88eac285d8548dddc0405e58cff
Kiyoung Kim [Mon, 14 Sep 2020 02:22:19 +0000 (11:22 +0900)]
Set APEX namespace as visible
Some of the APEX namespace should be visible from some sections, even
when the APEX namespace is not required from dependency resolution. This
change adds a new property in linker.config.txt to enforce APEX
namespace as available and visible from all sections.
Bug:
167946001
Test: atest passed
Change-Id: Ia0681b58a571ca977a97968494ad17502582253b
vichang [Fri, 11 Sep 2020 10:19:37 +0000 (10:19 +0000)]
Merge "Add a new public library libicu.so"
Xin Li [Thu, 10 Sep 2020 03:21:28 +0000 (20:21 -0700)]
Merge Android R
Bug:
168057903
Merged-In: I7a490c6ba010b984d50bc5eb66e0b7cd0dfb6ff4
Change-Id: Idb4d38b66ab90702faceee88c548dfda037e06d6
Jooyung Han [Tue, 8 Sep 2020 23:47:06 +0000 (23:47 +0000)]
Remove hard-coded references for JNI apexes am:
37d643da15
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1417035
Change-Id: I7a490c6ba010b984d50bc5eb66e0b7cd0dfb6ff4
Jooyung Han [Tue, 8 Sep 2020 23:47:03 +0000 (23:47 +0000)]
make APEXes with public libraries visible am:
52ccfa77b7
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1416070
Change-Id: I8363042a87448b03b43ee37405d38943d1895315
Jooyung Han [Fri, 28 Aug 2020 09:58:54 +0000 (18:58 +0900)]
Remove hard-coded references for JNI apexes
As statsd & conscrypt apexes expose JNI libs via apex_manifest,
linkerconfig makes them as visible when JNI libs are required.
Bug:
150767721
Test: atest --host linkerconfig_diff_test
atest MtsConscryptTestCases
Change-Id: I64d0c24e791205c39b4b9b01abda57cf49f68606
Jooyung Han [Tue, 1 Sep 2020 04:49:27 +0000 (13:49 +0900)]
make APEXes with public libraries visible
Public libraries (listed in /system/etc/public.libraries.txt) should be
available to classloader-namespace (created by libnativeloader). So,
linkerconfig reads public.libraries.txt and makes apexes with public
libraries visible. This cleans up hard-coded references to nn, i18n, art
apexes.
And the list of apexes along with public libs are stored in
/linkerconfig/apex.libraries.config.txt so that libnativeloader can read
it and link them to classloader-namespace.
Bug:
150767721
Test: cuttlefish boots
Test: atest --host linkerconfig_diff_test
Change-Id: Idd7e2b0bcc6e54cd79c2b9c4c755f883b4507b74
Kiyoung Kim [Tue, 8 Sep 2020 00:27:19 +0000 (00:27 +0000)]
Retrieve extra informations from APEX config file am:
f9920e2db4
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1400127
Change-Id: I0d5426e2488b97c0b83e09e449d857a96934d713
Kiyoung Kim [Mon, 31 Aug 2020 04:55:25 +0000 (13:55 +0900)]
Retrieve extra informations from APEX config file
Some of the APEX modules require extra configuration to make it work.
This change includes getting extra permitted paths to enable each APEX
module can update configuration by itself.
Bug:
148647510
Test: CF boot succeeded
Change-Id: I708e9a93bd5b54be91de1908640b90a26abb939c
Treehugger Robot [Thu, 3 Sep 2020 03:07:05 +0000 (03:07 +0000)]
Merge "Add /data/local/tests/* directories for each linker namespace" am:
636293b191
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1415830
Change-Id: If962e208b526e2eb62d5a4f9f2e30acb4c9304ab
Treehugger Robot [Thu, 3 Sep 2020 02:26:11 +0000 (02:26 +0000)]
Merge "Add /data/local/tests/* directories for each linker namespace"
Victor Chang [Wed, 2 Sep 2020 22:40:24 +0000 (23:40 +0100)]
Add a new public library libicu.so
Bug:
160350521
Test: m droid
Change-Id: I69fa789ac9ed618c4f7627573a68d110235dd639
Martin Stjernholm [Wed, 2 Sep 2020 04:27:44 +0000 (04:27 +0000)]
Fix the linkerconfig host binary to not depend on libc++.so. am:
aefc84e989
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1418008
Change-Id: I0ea4ad0ff71f9090df7306503fb263a62e75222f
Colin Cross [Mon, 31 Aug 2020 04:46:23 +0000 (21:46 -0700)]
Add /data/local/tests/* directories for each linker namespace
Add entries for atest to push tests to under /data/local/tests
to allow tests to be run in the appropriate linker namespace.
Bug:
138450837
Test: atest binderVendorDoubleLoadTest memunreachable_unit_test memunreachable_binder_test
Test: atest --host linkerconfig_diff_test
Change-Id: I3839cf48ca233669a81dd4bb1584fc50300acfd9
Martin Stjernholm [Tue, 1 Sep 2020 18:27:53 +0000 (19:27 +0100)]
Fix the linkerconfig host binary to not depend on libc++.so.
Test: build/soong/scripts/build-aml-prebuilts.sh runtime-module-host-exports
Check with ldd that the linkerconfig binary in
out/aml/soong/mainline-sdks/runtime-module-host-exports-current.zip
isn't missing any DSO's.
Bug:
145934348
Change-Id: I08676a5d9c7ec3e76462fb74e882f81802528b98
Xin Li [Thu, 27 Aug 2020 17:17:41 +0000 (10:17 -0700)]
Merge Android R (rvc-dev-plus-aosp-without-vendor@
6692709)
Bug:
166295507
Merged-In: I850da98f4c9cf1fcefdc8c95a7e604c310697423
Change-Id: Iff0180b58beb9101e330a109a1cb8a90255e0e46
Jooyung Han [Sat, 22 Aug 2020 00:45:35 +0000 (00:45 +0000)]
Support :vndk requirement from /product partition am:
949e311380
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1405889
Change-Id: I28f3eee88aae387fc05cce617ca0894093de8e84
Jooyung Han [Fri, 21 Aug 2020 09:50:18 +0000 (18:50 +0900)]
Support :vndk requirement from /product partition
linkerconfig can now distinguish /product/apex from /vendor/apex.
So, it provides correct version of VNDK to vendor apexes.
Bug:
159576928
Test: atest --host linkerconfig_diff_test
Change-Id: Ib11dd1c51a6b9e0c875edab12bb37026e33a80cc
Jooyung Han [Tue, 18 Aug 2020 09:28:49 +0000 (09:28 +0000)]
Skip reading apex-info-list when there's no apexes am:
a2a5d03590
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1403307
Change-Id: Ia2359605430f0179dd0a738f33ff0eef71473381
Jooyung Han [Tue, 18 Aug 2020 07:35:31 +0000 (16:35 +0900)]
Skip reading apex-info-list when there's no apexes
linkerconfig may run even when there's no apexes activated. We need to
skip reading apex-info-list.xml then. Otherwise, it will emit an error
log when it is perfectly normal.
> E linkerconfig: Can't read /apex/apex-info-list.xml: No such file or directory
Bug: n/a
Test: device boots & see logs if there's an error
Change-Id: I8f6255de536618ad590ce18adf9b729e45c721df
Jason Macnak [Tue, 18 Aug 2020 02:21:53 +0000 (02:21 +0000)]
Merge "Add /vendor/lib/egl to sphal namespace" am:
869afe1f71
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1400190
Change-Id: I951388ba0eb4446e93b03853ece30b01cbcd1ecc
Jason Macnak [Tue, 18 Aug 2020 02:10:38 +0000 (02:10 +0000)]
Merge "Add /vendor/lib/egl to sphal namespace"
Jason Macnak [Fri, 14 Aug 2020 17:36:16 +0000 (10:36 -0700)]
Add /vendor/lib/egl to sphal namespace
... to support having ANGLE as the native GL driver
which needs to dlopen libGLESv2. Without this change,
devices would have to create symlinks from libs in the
nested egl directory to the parent directory.
Bug: b/
165022040
Test: launch Cuttlefish with ANGLE
Change-Id: Ib60bd8397fdf1f1ba52bbe1c249ae100c0c68e70
Treehugger Robot [Sat, 15 Aug 2020 07:44:37 +0000 (07:44 +0000)]
Merge changes from topic "revert-
1387130-revert-apex-info-list-XDFTNNKFQI" am:
a5e31e2f92
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1396430
Change-Id: I863efc0f8fe1d73ebe6b8943a4ff7489b3331bcf
Treehugger Robot [Sat, 15 Aug 2020 07:34:44 +0000 (07:34 +0000)]
Merge changes from topic "revert-
1387130-revert-apex-info-list-XDFTNNKFQI"
* changes:
Revert^2 "Fix "vndk" namespace for vendor apexes"
Revert^2 "Read apex-info-file.xml to distinguish vendor apex"
Jooyung Han [Tue, 11 Aug 2020 08:56:29 +0000 (08:56 +0000)]
Revert^2 "Fix "vndk" namespace for vendor apexes"
51a44276496b47a2a682d6498a47d52b70cc40ee
Change-Id: Id608e1e02b3d466a72194049548bca1a7756dd1f
Jooyung Han [Tue, 11 Aug 2020 08:56:29 +0000 (08:56 +0000)]
Revert^2 "Read apex-info-file.xml to distinguish vendor apex"
c7d600933296817cb4fbe611a25482567bd9cd44
Change-Id: Ic9b056b3726c6c385f9723a2fb5c5cc6609da3b3
Martin Stjernholm [Mon, 10 Aug 2020 15:50:35 +0000 (15:50 +0000)]
Make linkerconfig a static executable only on device. am:
908bfdbd22
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1393397
Change-Id: Ic74811e81c6dbcab1bfcae2ad9373a380968a9bf
Martin Stjernholm [Fri, 7 Aug 2020 18:00:55 +0000 (19:00 +0100)]
Make linkerconfig a static executable only on device.
Don't link libc statically on host, but everything else is still
static.
Test: `art/tools/buildbot-build.sh --target` on AOSP master
Test: `art/tools/buildbot-build.sh --target`
on master-art with prebuilt linkerconfig binary.
Test: Flash & boot
Bug:
162819454
Change-Id: I78e5d2ed5f654ea7db11e227556ec29b06eb1349
Jooyung Han [Wed, 5 Aug 2020 07:11:48 +0000 (07:11 +0000)]
Add :sphal, :vndksp for apex configuration am:
0bb103f96d
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1373257
Change-Id: I42e16b6a06c2a58241723f52e01c7725f71f6f79
Jooyung Han [Tue, 28 Jul 2020 01:26:41 +0000 (10:26 +0900)]
Add :sphal, :vndksp for apex configuration
This removes hard-coded special-casing of com.android.media.swcodec
APEX.
swcodec APEX declares "requireNativeLibs" with ":sphal" so that
linkerconfig can add "sphal" and "vndk" namespaces for it. Note that
a link from sphal to vndk with shared_libs(VNDK-SP) is derived by
":vndksp" from "sphal" namespace.
Bug: n/a
Test: ./rundiff.sh
=> no significant changes
Test: build & device boots
Merged-In: Ib2c78cde05b745d6b1e2b06b88e40446c0ddd4f0
Change-Id: Ib2c78cde05b745d6b1e2b06b88e40446c0ddd4f0
(cherry picked from commit
e70d72dda438ab1629e6df42cda917a8b69cbb01)
Treehugger Robot [Wed, 5 Aug 2020 05:27:06 +0000 (05:27 +0000)]
Merge "Update codebase with static analysis result" am:
53edf3a707
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1386196
Change-Id: Ifd2d642d358df49443992e80dc83b62f6836096b
Treehugger Robot [Wed, 5 Aug 2020 05:15:47 +0000 (05:15 +0000)]
Merge "Update codebase with static analysis result"
Kiyoung Kim [Mon, 3 Aug 2020 14:15:52 +0000 (23:15 +0900)]
Update codebase with static analysis result
There were some issues reported by code static analysis tool. This
change includes update from the result with applicable items.
Test: cf booted & atest passed
Change-Id: I7d8e4e6c8dc1fc5893ab1d2365eb64fce47db220
Merged-In: I7d8e4e6c8dc1fc5893ab1d2365eb64fce47db220
Jooyung Han [Tue, 4 Aug 2020 15:08:01 +0000 (15:08 +0000)]
Revert "Read apex-info-file.xml to distinguish vendor apex" am:
c7d6009332
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1387131
Change-Id: I90242e1d91f0a401e4c1768d97a8000a5e4f7f91
Jooyung Han [Tue, 4 Aug 2020 15:07:59 +0000 (15:07 +0000)]
Revert "Fix "vndk" namespace for vendor apexes" am:
51a4427649
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1387130
Change-Id: I9d2401e3330b89c591e3dfae1c393b500350c6ac
Jooyung Han [Tue, 4 Aug 2020 11:23:55 +0000 (20:23 +0900)]
Revert "Read apex-info-file.xml to distinguish vendor apex"
This reverts commit
d32f7fa2697f38898c8c07459796bc823fa34666.
Reason: breaks master-art
Bug:
162819454
Test: m nothing
Change-Id: Ia658a473d5957f7ffef9851449559ce92961a991
Jooyung Han [Tue, 4 Aug 2020 11:23:47 +0000 (20:23 +0900)]
Revert "Fix "vndk" namespace for vendor apexes"
This reverts commit
5e40c4c723c4582ca334d2a1e2ec2ad5dda3b078.
Reason: breaks master-art branch
Bug: n/a
Test: m nothing
Change-Id: Ic918465aa629045049ccd76b564e5e2c9cdf8761
Jooyung Han [Tue, 4 Aug 2020 03:31:04 +0000 (03:31 +0000)]
Merge changes from topic "vndk-apex-build" am:
45f1026c2c
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1376877
Change-Id: Ide13bb28ae65ab5e67f542dae6e5bfd9f8ca2a93
Jooyung Han [Tue, 4 Aug 2020 03:31:02 +0000 (03:31 +0000)]
Read apex-info-file.xml to distinguish vendor apex am:
d32f7fa269
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1376876
Change-Id: Idf3ab6c1abc201dc5d55569af601a28fd6658e8b
Jooyung Han [Tue, 4 Aug 2020 03:11:49 +0000 (03:11 +0000)]
Merge changes from topic "vndk-apex-build"
* changes:
Fix "vndk" namespace for vendor apexes
Read apex-info-file.xml to distinguish vendor apex
Kiyoung Kim [Mon, 3 Aug 2020 04:11:56 +0000 (04:11 +0000)]
Merge "Mark vndk_in_system namespace as invisible" am:
edf3069eed
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1382120
Change-Id: Ib5ecc399174a9e7e482575cbc74e5cb83690db4c
Kiyoung Kim [Mon, 3 Aug 2020 03:57:46 +0000 (03:57 +0000)]
Merge "Mark vndk_in_system namespace as invisible"
Jooyung Han [Wed, 29 Jul 2020 16:37:30 +0000 (01:37 +0900)]
Fix "vndk" namespace for vendor apexes
"vndk" namespace for non-system use cases (e.g. vendor section, vendor
apex, etc) should have /vndk as well as /vndk-sp to support VDNK
extensions.
In the following example, "vendor_hello" is a cc_library(vendor:true)
with dependencies to libbase/libc++/liblog, which is bundled in a vendor
apex "com.android.hello".
libbase/libc++(VNDK) are from VNDK APEX and liblog(LLNDK) are from
/system/lib.
$ adb shell ldd /apex/com.android.hello/bin/vendor_hello
linux-gate.so.1 => [vdso] (0xea2b3000)
libbase.so => /apex/com.android.vndk.vS/lib/libbase.so (0xe984b000)
libc++.so => /apex/com.android.vndk.vS/lib/libc++.so (0xe9788000)
liblog.so => /system/lib/liblog.so (0xe9f44000)
libc++.so => /system/lib/libc++.so (0xe98c3000)
libc.so => /apex/com.android.runtime/lib/bionic/libc.so (0xe99dd000)
libm.so => /apex/com.android.runtime/lib/bionic/libm.so (0xe9881000)
libdl.so => /apex/com.android.runtime/lib/bionic/libdl.so (0xe99ab000)
Bug:
159576928
Test: build a vendor apex with use_vndk_as_stable
check the dependency of a binary in it
Change-Id: I04e9e72af34630e08d4828d4ff644b0ee2aa861b
Jooyung Han [Mon, 3 Aug 2020 03:22:55 +0000 (03:22 +0000)]
vndk: add vendor/lib or product/lib to search_path am:
d258eba1c4
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1385027
Change-Id: Ie1aaba4f1e350685863d336b67a82090ea1d07ac
Jooyung Han [Wed, 29 Jul 2020 16:15:18 +0000 (01:15 +0900)]
Read apex-info-file.xml to distinguish vendor apex
/apex/apex-info-file.xml is the list of all apexes with preinstalled
path. By looking up original paths, we can figure out if an apex is
from /vendor or /system even if it is updated.
Bug:
159576928
Test: build & device boots
Change-Id: Ie32b10bfbdd9c1b6026c4b0fc93b57a2af6b5da5
Jooyung Han [Fri, 31 Jul 2020 09:58:09 +0000 (18:58 +0900)]
vndk: add vendor/lib or product/lib to search_path
"vndk" namespace have vendor/lib/vndk first in search paths so that VNDK
extension libraries have higher proiorty than normal VNDK libs.
However, VNDK extensions are allowed to use vendor libraries
(/vendor/lib). This was enabled by linking "sphal" namespace.
It was a bit weird because sphal namespace links vndk and vndk links
sphal again.
Moreover, "vndk_product" namespace can't link to /product/lib. We could
have "product" namespace and link it from vndk_product.
But instead, we add /vendor/lib to the search paths of "vndk" namespace
and /product/lib to "vndk_product" namespace so that VNDK extensions use
libs from there.
Now we don't need to link sphal from vndk.
Bug:
162462078
Test: HelloActivityProduct loads libjni_product successfully.
Merged-In: I6c5d47239dae427194345e03522a726997389167
Change-Id: I6c5d47239dae427194345e03522a726997389167
(cherry picked from commit
87122ca998fdc6f6d404fbe0539221eb9d242ca2)
Luke Huang [Sun, 2 Aug 2020 15:02:38 +0000 (15:02 +0000)]
Cleanup for Android's inclusive language guidance am:
1fc46cc922
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1379236
Change-Id: I9698e9638aefe7d808ce5f90fde828e3b701a1a9
Kiyoung Kim [Fri, 31 Jul 2020 08:24:28 +0000 (17:24 +0900)]
Mark vndk_in_system namespace as invisible
vndk_in_system namespace is visible currently. However, this namespace
should be invisible as it exists within vendor section and contains
system library paths, so mark this as visible can cause disallowed
access from vendor binary to system libs. This change marks
vndk_in_system namespace as invisible.
Bug:
161076708
Test: Cuttlefish Go phone GTS test passed
Change-Id: If82cc9c1cc279125bed9977d1bcdc930e45880db
Luke Huang [Thu, 30 Jul 2020 06:05:33 +0000 (14:05 +0800)]
Cleanup for Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code
for reference.
Bug:
161896447
Test: atest
Change-Id: I3afbccdb8fee2a8aa89978c8f26ebca2d3216f05
Jooyung Han [Wed, 29 Jul 2020 00:05:26 +0000 (00:05 +0000)]
Make diff test as presubmit am:
fcaa89aac3
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1264240
Change-Id: Ic6a90432672fe19093e012bafc1339a113cc2844
Jooyung Han [Fri, 20 Mar 2020 09:20:23 +0000 (18:20 +0900)]
Make diff test as presubmit
so that changes to the output can be tracked.
Bug:
140599044
Test: atest --host linkerconfig_diff_test
Change-Id: I2055ae742d3f480dc1d74b95db0ee7b864794a71
Jooyung Han [Tue, 28 Jul 2020 02:08:02 +0000 (02:08 +0000)]
Support ":vndk" to use vndk libs from vendor apex am:
1ee5f5c8b1
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1371701
Change-Id: Icf59b58485735b60096c33d41af63e7c0cc67c55
Jooyung Han [Fri, 24 Jul 2020 08:20:40 +0000 (17:20 +0900)]
Support ":vndk" to use vndk libs from vendor apex
Vendor APEX can be configured to use VNDK libs from the outside of the
apex. The dependency to external VNDK is marked in apex_manifest's
"requireNativeLibs" field as ":vndk", which is a pseudo name of VNDK
libs.
Bug:
159576928
Test: ./rundiff.sh
Change-Id: I6dd85270354d085877014c39088969c62314f614
Jooyung Han [Mon, 27 Jul 2020 09:24:05 +0000 (09:24 +0000)]
Merge "Add extra search path(/system_ext/lib)" am:
a8d5c7c4b3
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1371708
Change-Id: Iba8c23eb471140538a1028551ee64a611928bba7
Jooyung Han [Mon, 27 Jul 2020 09:08:08 +0000 (09:08 +0000)]
Merge "Add extra search path(/system_ext/lib)"
Jooyung Han [Mon, 27 Jul 2020 07:47:11 +0000 (16:47 +0900)]
Add extra search path(/system_ext/lib)
"system" namespace for apex binaries should list /system_ext/lib as well
as /system/lib because /system_ext/lib is also considered as "system".
Bug:
158435319
Test: ./rundiff.sh
Test: build & device boots
Change-Id: I6b131eb57da60eee8fb3fdbc21b0b7125758146f
Kiyoung Kim [Mon, 27 Jul 2020 01:44:19 +0000 (01:44 +0000)]
Create isolated section under /data am:
791bd11b2a
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1364666
Change-Id: I443b45be2b43f9db8c4a9f80f431e3225b3f52cc
Kiyoung Kim [Tue, 14 Jul 2020 06:28:55 +0000 (15:28 +0900)]
Create isolated section under /data
Some of the engineers are using /data for non-framework development, but
it is hard to use as /data shares section with /system, so many
libraries are linked with system one first. This changes creates a new
isolated section from subdirectory of /data so developers can run their
own executables with linked to their own libs first.
Bug:
160231064
Test: Checked from Cuttlefish that isolated section is created as expected
Change-Id: I047ee69b9ae7a4b01894c3a29efd4226ab47ce56
Richard Fung [Fri, 26 Jun 2020 02:33:05 +0000 (02:33 +0000)]
Check for treble devices before failing due to vndk-lite am:
28d91b58e4 am:
9f26989d69
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1350842
Change-Id: I850da98f4c9cf1fcefdc8c95a7e604c310697423
Richard Fung [Fri, 26 Jun 2020 02:16:56 +0000 (02:16 +0000)]
Check for treble devices before failing due to vndk-lite am:
28d91b58e4
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1350842
Change-Id: I938c066dfa7b00d3cae0d5d7bf4746d41b2261d8
Richard Fung [Thu, 25 Jun 2020 19:38:13 +0000 (12:38 -0700)]
Check for treble devices before failing due to vndk-lite
This fixes a bug where we fail if vndk-lite is enabled even though
treble isn't.
Bug: b/
159485432
Test: m -j and manually test with bertha
Change-Id: I24f8daef20699529e0fc9573a02c83cf64f63313
Jooyung Han [Wed, 24 Jun 2020 03:04:06 +0000 (03:04 +0000)]
Merge "Add Vendor APEX to testdata" am:
d15860864f am:
608aa30630
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1347305
Change-Id: I36d1afe35e699d0ec623ccb1544e66b0ed2dbfab
Jooyung Han [Wed, 24 Jun 2020 02:43:26 +0000 (02:43 +0000)]
Merge "Add Vendor APEX to testdata" am:
d15860864f
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1347305
Change-Id: I92ba5b4ce490fd063d70a6fb751a152b4e7b8fb9
Jooyung Han [Wed, 24 Jun 2020 02:28:33 +0000 (02:28 +0000)]
Merge "Add Vendor APEX to testdata"
Kiyoung Kim [Wed, 24 Jun 2020 01:22:27 +0000 (01:22 +0000)]
Merge "Fail when VNDK-Lite is enabled." am:
1f7108d0ed am:
1336bd232e
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1347304
Change-Id: I58b67e299bad675ee505016290830a557d55b7fa
Kiyoung Kim [Wed, 24 Jun 2020 01:09:59 +0000 (01:09 +0000)]
Merge "Fail when VNDK-Lite is enabled." am:
1f7108d0ed
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1347304
Change-Id: Iaba53a9134b71cfbb433b1220a11bfdda5eaa8bb
Kiyoung Kim [Wed, 24 Jun 2020 00:58:47 +0000 (00:58 +0000)]
Merge "Fail when VNDK-Lite is enabled."
Jooyung Han [Tue, 23 Jun 2020 13:27:26 +0000 (13:27 +0000)]
Refactor rundiff.sh to use prepare_root.sh am:
f3ff7b7154 am:
9528da6f9b
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1347303
Change-Id: I08952b35106b83d4a1ee0917a0804fe8052da060
Jooyung Han [Tue, 23 Jun 2020 13:15:47 +0000 (22:15 +0900)]
Add Vendor APEX to testdata
Linkerconfig doesn't care about Vendor APEXes yet.
Bug:
159576928
Test: ./rundiff.sh
Change-Id: I703789cc41e990b89a471f5489c120240faddba6
Jooyung Han [Tue, 23 Jun 2020 13:13:08 +0000 (13:13 +0000)]
Refactor rundiff.sh to use prepare_root.sh am:
f3ff7b7154
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1347303
Change-Id: I13374687cf6da38eeddbeb53695048f068f32afc
Jooyung Han [Tue, 23 Jun 2020 09:07:17 +0000 (18:07 +0900)]
Refactor rundiff.sh to use prepare_root.sh
prepare_root.sh activates apexes from /system, /product, etc and also
generates /apex/apex-info-list.xml
This is a preparation for linkerconfig to read /apex/apex-info-list.xml
which conveys the information about the original paths.
For example, linkerconfig will tell if an APEX is from /vendor or
/system.
Bug:
159576928
Test: ./rundiff.sh
Test: ./prepare_root.sh --in testdata/root --out testroot --all
testroot now contains every apex and apex-info-list.xml as well
Change-Id: Ied38aa402a5aa1606318a5b139687e05fc041683
Kiyoung Kim [Tue, 23 Jun 2020 09:03:23 +0000 (09:03 +0000)]
Deprecate VNDK-Lite from linkerconfig am:
fce4a27f52 am:
7b8ae129c3
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1347142
Change-Id: I5efe79efa7224a5645b0e8271e3e4296df9cf598
Kiyoung Kim [Tue, 23 Jun 2020 08:52:04 +0000 (08:52 +0000)]
Deprecate VNDK-Lite from linkerconfig am:
fce4a27f52
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1347142
Change-Id: If63756817d780e0868398d505b65c147996a7d7c
Kiyoung Kim [Tue, 23 Jun 2020 07:15:47 +0000 (16:15 +0900)]
Fail when VNDK-Lite is enabled.
To ensure generated linker configuration is not working with VNDK-Lite
vendor image, check if VNDK-Lite is enabled and fail if so.
Bug:
153944540
Test: m -j passed && Cuttlefish booted properly
Change-Id: I5dcee726e4d5b8fbfa6192c1e81e534b34073eb5
Kiyoung Kim [Tue, 23 Jun 2020 04:16:42 +0000 (13:16 +0900)]
Deprecate VNDK-Lite from linkerconfig
VNDK-Lite will no longer be supported from Android starting from S. As a
first step, remove VNDK Lite configuration from linkerconfig. This
change won't have any effect on Legacy and Treblelized devices.
Bug:
153944540
Test: Cuttlefish succeeded to boot
Test: Confirmed golden_output has changes only from VNDK-Lite.
Change-Id: I074fac0417a143b8aa25cd0056bc634c78ef7000
Jooyung Han [Mon, 22 Jun 2020 09:17:53 +0000 (09:17 +0000)]
Update test_data am:
ec262d2133 am:
a21bb27860
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1345371
Change-Id: I2b3b6b4423ba54c98a704461987106df8df7e53b
Jooyung Han [Mon, 22 Jun 2020 09:03:56 +0000 (09:03 +0000)]
Update test_data am:
ec262d2133
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1345371
Change-Id: Ic750f385699dc7ec4e55e3f73dfe314bcde0809e
Jooyung Han [Mon, 22 Jun 2020 07:37:16 +0000 (16:37 +0900)]
Update test_data
according to the change
0614dd02988b5879876c66642ecd08f6db6c95e7
"Add extra search paths from unrestricted section"
Bug:
158674810
Test: ./rundiff.sh
Change-Id: I3fad4cea4b8ea576264efb2043e131fd0f7c2b74
Kiyoung Kim [Wed, 17 Jun 2020 06:31:15 +0000 (06:31 +0000)]
[automerger skipped] Add extra search paths from unrestricted section am:
86a0d1a8b6 -s ours
am skip reason: Change-Id I37787a92df28c3713d607eaea6a031b2b9db0f3d with SHA-1
0614dd0298 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/linkerconfig/+/
11834813
Change-Id: I102b141287837357d8f06f2e0b50e59d666bf780
Kiyoung Kim [Wed, 17 Jun 2020 02:51:48 +0000 (02:51 +0000)]
Merge "Add extra search paths from unrestricted section" am:
2539447e8f am:
db9d1dab31
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1330897
Change-Id: I84ee7abff33847a6b24ddb9a5560984347fdf9d8
Kiyoung Kim [Wed, 17 Jun 2020 02:33:25 +0000 (02:33 +0000)]
Merge "Add extra search paths from unrestricted section" am:
2539447e8f
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1330897
Change-Id: I2f5b5d9edbaf9a9ae34a842410499709cab01d68
Kiyoung Kim [Fri, 12 Jun 2020 10:15:05 +0000 (19:15 +0900)]
Add extra search paths from unrestricted section
Add extra search paths - system_ext/${LIB} and product/${LIB} - so *TS
tests can be executed with extra libraries from the partners
Bug:
158674810
Test: Cuttlefish boot succeeded
Change-Id: I37787a92df28c3713d607eaea6a031b2b9db0f3d
Merged-In: I37787a92df28c3713d607eaea6a031b2b9db0f3d
Kiyoung Kim [Wed, 17 Jun 2020 02:16:29 +0000 (02:16 +0000)]
Merge "Add extra search paths from unrestricted section"
Kiyoung Kim [Fri, 12 Jun 2020 10:15:05 +0000 (19:15 +0900)]
Add extra search paths from unrestricted section
Add extra search paths - system_ext/${LIB} and product/${LIB} - so *TS
tests can be executed with extra libraries from the partners
Bug:
158674810
Test: Cuttlefish boot succeeded
Change-Id: I37787a92df28c3713d607eaea6a031b2b9db0f3d
Jooyung Han [Thu, 11 Jun 2020 12:07:02 +0000 (12:07 +0000)]
fix umask(022) am:
82bda261bb am:
15f22cac43
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1330894
Change-Id: Ic1c74bf991f360a3c7b55a6b7192ba2955ed3416
Jooyung Han [Thu, 11 Jun 2020 11:51:54 +0000 (11:51 +0000)]
fix umask(022) am:
82bda261bb
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1330894
Change-Id: I9e405da3454fcb71fad696d8361aca88576fad82
Jooyung Han [Thu, 11 Jun 2020 07:58:24 +0000 (16:58 +0900)]
fix umask(022)
Use octal(022) and fix the mistake.
Bug:
149914078
Test: check modes of linkerconfig-generated files
Change-Id: I7c984ab768dc1026a899534e8d21527df91575a6
Kiyoung Kim [Thu, 11 Jun 2020 05:29:02 +0000 (05:29 +0000)]
Generate ASAN paths with certain rules am:
813e6ff513 am:
aa82235b2a
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1324132
Change-Id: I2a58bc7600b82563dcdd747bc15ce6b675e3fadd
Kiyoung Kim [Thu, 11 Jun 2020 05:11:09 +0000 (05:11 +0000)]
Generate ASAN paths with certain rules am:
813e6ff513
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1324132
Change-Id: Ic8a1824ea35fe6465f2161ac6f43d825d4623024
Kiyoung Kim [Thu, 4 Jun 2020 08:27:36 +0000 (17:27 +0900)]
Generate ASAN paths with certain rules
Previously each paths had to specify if it should be included in ASAN
paths, and /data/asan is valid. However, most of paths comes with ASAN
path with /data/asan except /apex, we can make this as simple so anyone
can add extra paths without understanding of ASAN. This change is the
first step to remove all ASAN path description from path definition.
Bug:
139788162
Test: m -j passed && Crosshatch HWASAN boot succeeded
Change-Id: I7e89cfd81e5b5699112b0636691a8b6007a98f33
Jooyung Han [Mon, 1 Jun 2020 13:49:53 +0000 (13:49 +0000)]
Revert "Remove duplicate entries in shared_libs" am:
268151bf49 am:
970d1c87cc
Change-Id: I8e2464ebf6bb90e3b2f9d3af63682cf1188f47db
Jooyung Han [Mon, 1 Jun 2020 13:38:22 +0000 (13:38 +0000)]
Revert "Remove duplicate entries in shared_libs" am:
268151bf49
Change-Id: I156a37d85c0d850582378210cab596c51a47a114
Jooyung Han [Mon, 1 Jun 2020 12:27:33 +0000 (12:27 +0000)]
Revert "Remove duplicate entries in shared_libs"
This reverts commit
28ea47a3102a8cfd44d3e9315a18cae3ecb15287.
Reason for revert: b/
157742728 (performance regression)
Change-Id: I3d925814afa2c7a8ac86e1dc5a5c46800f3e03ee
Jooyung Han [Fri, 29 May 2020 09:50:56 +0000 (09:50 +0000)]
Remove duplicate entries in shared_libs am:
28ea47a310 am:
1be3952c58
Change-Id: Ic1a3373c24e73a77f6240a880c297740841a943d
Jooyung Han [Fri, 29 May 2020 09:30:06 +0000 (09:30 +0000)]
Remove duplicate entries in shared_libs am:
28ea47a310
Change-Id: If66a3408f28c47915fd929d10910ac5685e8e6c8
Jooyung Han [Fri, 29 May 2020 03:19:33 +0000 (12:19 +0900)]
Remove duplicate entries in shared_libs
This change includes
- shared_libs list gets de-duped and printed one-by-one
- whitelisted is concated as a one line
Bug:
157481401
Test: m && device boots
atest --host linkerconfig_modules_unittest
./rundiff.sh
Change-Id: Ibfa53283f9db4adb29516849691d11473467d04f
Jooyung Han [Fri, 29 May 2020 02:33:36 +0000 (02:33 +0000)]
[automerger skipped] Add system stubs as "provided" from vendor default am:
35ab6db3f5 -s ours
am skip reason: Change-Id I1d68e12b34e360eb34edeb5155982b545c89c2f4 with SHA-1
50371b2bf3 is in history
Change-Id: I833b68732e4951f96c3c66690166e93d4763eb3e