OSDN Git Service
Jooyung Han [Tue, 4 Aug 2020 15:26:01 +0000 (15:26 +0000)]
Revert "Fix "vndk" namespace for vendor apexes" am:
51a4427649 am:
58ab18bc1d
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1387130
Change-Id: I0bb1a74bb3865fa3790dcce249a19b9cd4f5968d
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: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:54:34 +0000 (03:54 +0000)]
Merge changes from topic "vndk-apex-build" am:
45f1026c2c am:
40991498ac
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1376877
Change-Id: I1dcc3d71c1dc160a38cf524b1df7681fb7da37f4
Jooyung Han [Tue, 4 Aug 2020 03:54:32 +0000 (03:54 +0000)]
Read apex-info-file.xml to distinguish vendor apex am:
d32f7fa269 am:
1fcee56ec8
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1376876
Change-Id: I3742fcef5464d277dc23fb824ea1cfca7b4e5f4d
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:32:41 +0000 (04:32 +0000)]
Merge "Mark vndk_in_system namespace as invisible" am:
edf3069eed am:
ba2949d0a8
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1382120
Change-Id: I795f39ab324c64504413cbebbef00e027138896d
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 [Mon, 3 Aug 2020 03:45:31 +0000 (03:45 +0000)]
vndk: add vendor/lib or product/lib to search_path am:
d258eba1c4 am:
baf1c90894
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1385027
Change-Id: I9b49785ebf5f00ffcec4e1cd7883d7ead33f78b7
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:26:49 +0000 (15:26 +0000)]
Cleanup for Android's inclusive language guidance am:
1fc46cc922 am:
2552a892ab
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1379236
Change-Id: Ic3a72bd97c5513f0cc9665603c063c371d3733c6
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:26:35 +0000 (00:26 +0000)]
Make diff test as presubmit am:
fcaa89aac3 am:
14f279c468
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1264240
Change-Id: Ibc1bc24be0b70e3bbaefd8ce81bcfda5bb376640
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:21:42 +0000 (02:21 +0000)]
Support ":vndk" to use vndk libs from vendor apex am:
1ee5f5c8b1 am:
c3adbd1f54
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1371701
Change-Id: I223eb47d7905ad2af85ede3e9853711553ad0633
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:38:37 +0000 (09:38 +0000)]
Merge "Add extra search path(/system_ext/lib)" am:
a8d5c7c4b3 am:
253cac066b
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1371708
Change-Id: Id9986772b8ce4d9cedac0490a517996610a02099
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:59:15 +0000 (01:59 +0000)]
Create isolated section under /data am:
791bd11b2a am:
6025a21deb
Original change: https://android-review.googlesource.com/c/platform/system/linkerconfig/+/
1364666
Change-Id: Ic1567de471e7fa5fba5b93d7cfcd0690b39168de
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
Jooyung Han [Fri, 29 May 2020 01:17:44 +0000 (01:17 +0000)]
Merge "Add system stubs as "provided" from vendor default" am:
1b926b2cc0 am:
b841b211c7
Change-Id: I8271fe190a51b1ca5df3ffd1b4423031ddaba69a
Jooyung Han [Fri, 29 May 2020 01:02:40 +0000 (01:02 +0000)]
Merge "Add system stubs as "provided" from vendor default" am:
1b926b2cc0
Change-Id: I1e1ce47f7c08f8411733cc117e0d495d0d15de20
Jooyung Han [Wed, 27 May 2020 10:38:37 +0000 (19:38 +0900)]
Add system stubs as "provided" from vendor default
For VNDK-lite devices, the default namespace of the vendor section works
like the default namespace of the system section.
So, provides/requires should be same as the system.default NS.
Bug:
153412158
Test: rundiff.sh
check if vendor.com_android_os_statsd namespace has access to
libbinder_ndk.so from vendor.default namespace
Merged-In: I1d68e12b34e360eb34edeb5155982b545c89c2f4
Change-Id: I1d68e12b34e360eb34edeb5155982b545c89c2f4
(cherry picked from commit
50371b2bf332a26b4f42191e0869a558db9d3222)
Jooyung Han [Fri, 29 May 2020 00:48:16 +0000 (00:48 +0000)]
Merge "Add system stubs as "provided" from vendor default"
Jooyung Han [Thu, 28 May 2020 10:24:47 +0000 (10:24 +0000)]
Merge changes Ie414fef3,Ie15838b0,Ifec60ace,I255cb0a7,I0979e702 am:
fd1cd899c8 am:
37c1186ce0
Change-Id: I214d365deb9946767047bd2006bf67333311f864
Kiyoung Kim [Thu, 28 May 2020 10:24:46 +0000 (10:24 +0000)]
[automerger skipped] Match vendor requires with system from VNDK Lite am:
b604764645 am:
944adff126 -s ours
am skip reason: Change-Id Ie15838b0506b3fcd617f624572f1a560eda07987 with SHA-1
fde439ab45 is in history
Change-Id: If951681128d7a8de702b673bb35ee7e6c86ece3b
Kiyoung Kim [Thu, 28 May 2020 10:24:45 +0000 (10:24 +0000)]
Update golden_output am:
73c22fcbcd am:
3c76cd6556
Change-Id: I023b1146ffe95b981b9ade3d862cfd01de722a38
Kiyoung Kim [Thu, 28 May 2020 10:24:44 +0000 (10:24 +0000)]
[automerger skipped] Add libandroidicu.so link for VNDK-Lite vendor am:
12633592f0 am:
4819b756df -s ours
am skip reason: Change-Id I255cb0a74cd996b1ce9c30c488edac063ab72ea8 with SHA-1
9811370003 is in history
Change-Id: I50585016a1ecf7e4e2f1c2d0580b6ce787abf3cf
Jooyung Han [Thu, 28 May 2020 10:24:42 +0000 (10:24 +0000)]
Add com.android.os.statsd testdata am:
e543413e4d am:
ccdbe514c4
Change-Id: Idae3c06b5fd7089fcbcf0a72bc52f87210ef5060
Jooyung Han [Thu, 28 May 2020 10:03:49 +0000 (10:03 +0000)]
Merge changes Ie414fef3,Ie15838b0,Ifec60ace,I255cb0a7,I0979e702 am:
fd1cd899c8
Change-Id: Ic8d178f8b132e4fb570345ae40c804a22ea4b6ba
Kiyoung Kim [Thu, 28 May 2020 10:03:48 +0000 (10:03 +0000)]
Match vendor requires with system from VNDK Lite am:
b604764645
Change-Id: I737740076214e67e0a17643348e5ab4beed751bb
Kiyoung Kim [Thu, 28 May 2020 10:03:46 +0000 (10:03 +0000)]
Update golden_output am:
73c22fcbcd
Change-Id: Ide86863fb1ec2dd79f75d441a27b37060168e7b1
Kiyoung Kim [Thu, 28 May 2020 10:03:44 +0000 (10:03 +0000)]
Add libandroidicu.so link for VNDK-Lite vendor am:
12633592f0
Change-Id: Ia35b4ef62aca4f06c0b5d39e9c549fa9593e4c9c
Jooyung Han [Thu, 28 May 2020 10:03:41 +0000 (10:03 +0000)]
Add com.android.os.statsd testdata am:
e543413e4d
Change-Id: Ie272469044bc2cdea5f3fc7d337b822583704f1f
Jooyung Han [Thu, 28 May 2020 09:41:47 +0000 (09:41 +0000)]
Merge changes Ie414fef3,Ie15838b0,Ifec60ace,I255cb0a7,I0979e702
* changes:
Update golden_output
Match vendor requires with system from VNDK Lite
Update golden_output
Add libandroidicu.so link for VNDK-Lite vendor
Add com.android.os.statsd testdata
Jooyung Han [Thu, 28 May 2020 04:09:44 +0000 (13:09 +0900)]
Update golden_output
This change fills the gap between internal and aosp
Bug: n/a
Test: ./rundiff.sh
Change-Id: I3fc293cc1452e63d21c027914b8b392a6ae230df
Josh Gao [Thu, 28 May 2020 03:42:25 +0000 (03:42 +0000)]
Merge "Add system link for libfdtrack.so" am:
464a34be4b am:
071b9132ff
Change-Id: I33ceb77ba7d0fb84f5d791b4f243516e9756e3bc
Josh Gao [Thu, 28 May 2020 03:28:23 +0000 (03:28 +0000)]
Merge "Add system link for libfdtrack.so" am:
464a34be4b
Change-Id: I2e696ff80dda0e653290228e1e9b3c8466cc7067
Josh Gao [Thu, 28 May 2020 03:20:48 +0000 (03:20 +0000)]
Merge "Add system link for libfdtrack.so"
Jooyung Han [Wed, 27 May 2020 10:38:37 +0000 (19:38 +0900)]
Add system stubs as "provided" from vendor default
For VNDK-lite devices, the default namespace of the vendor section works
like the default namespace of the system section.
So, provides/requires should be same as the system.default NS.
Bug:
153412158
Test: rundiff.sh
check if vendor.com_android_os_statsd namespace has access to
libbinder_ndk.so from vendor.default namespace
Change-Id: I1d68e12b34e360eb34edeb5155982b545c89c2f4
Kiyoung Kim [Tue, 14 Apr 2020 08:39:13 +0000 (17:39 +0900)]
Update golden_output
for the change: Ie15838b0506b3fcd617f624572f1a560eda07987
Bug:
153412158
Test: ./rundiff.sh
Change-Id: Ie414fef3ab4cd2921073513b9e35f34f9b28060c
Kiyoung Kim [Tue, 14 Apr 2020 08:39:13 +0000 (17:39 +0900)]
Match vendor requires with system from VNDK Lite
Vendor section of VNDK Lite device has search path for /system/lib, so
in general VNDK Lite's vendor section's default namespace should have same
scope of requires with system section's default namespace. This change
updates vendor's default namespace to require libraries same from
system's default namespace.
Bug:
153412158
Test: m -j passed
Merged-In: Ie15838b0506b3fcd617f624572f1a560eda07987
Change-Id: Ie15838b0506b3fcd617f624572f1a560eda07987
(cherry picked from commit
fde439ab4555a047bea49081c88218571e4bf2d9)
Kiyoung Kim [Wed, 8 Apr 2020 06:47:59 +0000 (15:47 +0900)]
Update golden_output
for the change: I255cb0a74cd996b1ce9c30c488edac063ab72ea8
Bug:
153412158
Test: ./rundiff.sh
Change-Id: Ifec60acedaa064479aa9c93a68fe2cf277694260
Kiyoung Kim [Wed, 8 Apr 2020 06:47:59 +0000 (15:47 +0900)]
Add libandroidicu.so link for VNDK-Lite vendor
libandroidicu.so is required from vendor default namespace which should
be linked to ART APEX, but it was missed. This change adds required
library which can be linked from ART APEX.
Bug:
153412158
Test: m -j passed
Merged-In: I255cb0a74cd996b1ce9c30c488edac063ab72ea8
Change-Id: I255cb0a74cd996b1ce9c30c488edac063ab72ea8
(cherry picked from commit
9811370003c4d88ed6a3a396a21ad1306c57add8)
Jooyung Han [Wed, 27 May 2020 13:24:59 +0000 (22:24 +0900)]
Update golden_output
When cherry-picking from rvc-dev to aosp, golden_output changes were
skipped by auto-merger in the rvc-dev-plus-aosp and its downstream
branches.
Bug: n/a
Test: ./rundiff.sh
Change-Id: Icc9110bc011c5727a6a9e814ba49c70cc58045b9
Jooyung Han [Wed, 27 May 2020 10:09:49 +0000 (19:09 +0900)]
Add com.android.os.statsd testdata
The default namespace of the system section "requires" some libraries
which are provided by com.andorid.os.statsd.
Test: ./rundiff.sh
Change-Id: I0979e7025daea2b1d87d9ad9dd4149cc62257073
Kiyoung Kim [Wed, 27 May 2020 08:31:18 +0000 (08:31 +0000)]
[automerger skipped] Do not isolate sphal and vndk from unrestricted am:
2d44cfc444 am:
8b6decd193 -s ours
am skip reason: Change-Id Ib1526e225971312f126d75f26d7aa5c523011922 with SHA-1
2e13598eb9 is in history
Change-Id: Iac2f419a6bdb43cac6e33503a75d05d69f59c797
Kiyoung Kim [Wed, 27 May 2020 08:18:34 +0000 (08:18 +0000)]
Do not isolate sphal and vndk from unrestricted am:
2d44cfc444
Change-Id: Ieef083c35c4d6e672a7795d123f215a3b0760d0f