OSDN Git Service
Jooyung Han [Thu, 14 Nov 2019 06:07:31 +0000 (22:07 -0800)]
Merge "vndk-ext should come before vndk(VNDK APEX)"
am:
1314c36936
Change-Id: Iaf16abaf2c5f4ac25c384f6d68b4e2262707c1b5
Treehugger Robot [Thu, 14 Nov 2019 05:56:19 +0000 (05:56 +0000)]
Merge "vndk-ext should come before vndk(VNDK APEX)"
Jooyung Han [Thu, 14 Nov 2019 04:27:19 +0000 (13:27 +0900)]
vndk-ext should come before vndk(VNDK APEX)
vndk-ext (/vendor/{LIB}/vndk) should come before vndk
(/apex/com.android.vndk.v{VER}/{LIB}) so that vndk-ext eclipse vndk.
Test: atest --host linkerconfig_contents_fulltest
Test: add vndkext lib to /vendor/{LIB}/vndk and check if it is loaded
correctly.
Change-Id: I554e2d0fdf5429e7e2bb3b3b955d852351d54a9f
Martin Stjernholm [Thu, 14 Nov 2019 00:58:03 +0000 (16:58 -0800)]
Retain relevant comments from system/core/rootdir/etc/ld.config.txt.
am:
7e36aeaa61
Change-Id: I12a163401f179ff3a393071a1f3b07b85e109f39
Martin Stjernholm [Mon, 11 Nov 2019 15:51:25 +0000 (15:51 +0000)]
Retain relevant comments from system/core/rootdir/etc/ld.config.txt.
This CL carries over the comments from the old text config that was deleted
in https://r.android.com/
1128832.
Test: N/A - comment changes only
Bug:
138920271
Change-Id: I4309599228cace3d19bba7bc992e80fe2eb66c69
Jiyong Park [Mon, 11 Nov 2019 04:52:40 +0000 (20:52 -0800)]
Add runtime namespace
am:
72410b5474
Change-Id: I984c724a9e153a2fe950a833b660589a61354a1f
Jiyong Park [Tue, 5 Nov 2019 06:54:05 +0000 (15:54 +0900)]
Add runtime namespace
libc_malloc_hooks/debug.so are included in the runtime APEX, which now
is only for the bionic libs. The libs should be loaded in isolatation
from other libs because they might not be compatible with other libs in
/system/lib. (the libs depend on libc++.so)
Creating the namespace 'runtime' where the libs can be loaded into.
No modification to the bionic side is needed because it already has been
trying to load the libs from the namespace. The namespace actually was
accidentaly disappeared during the split of the runtime APEX into
runtime and art APEXes.
Bug:
143892776
Test: bionic-unit-tests
Change-Id: I638c5f0439eb402338b90f2c01fddbfdae7d73e9
Daichi Hirono [Thu, 31 Oct 2019 03:38:30 +0000 (20:38 -0700)]
Merge "Revert "Revert "Check ro.treble.enabled for legacy devices"""
am:
8aa4ecefb5
Change-Id: Ifadf272d28482c3be696b72b299e837e564e6bbd
Treehugger Robot [Thu, 31 Oct 2019 03:12:39 +0000 (03:12 +0000)]
Merge "Revert "Revert "Check ro.treble.enabled for legacy devices"""
Daichi Hirono [Thu, 31 Oct 2019 01:49:23 +0000 (01:49 +0000)]
Revert "Revert "Check ro.treble.enabled for legacy devices""
This reverts commit
ab0f8cb501f2e42b1904dd0f79ca0f8b5a3cc5d6.
Reason for revert: Reland the fix after fixing internal device config.
Change-Id: Ib23c1136f5ad4bcc3e1f6aa8f2c0b9ad7d5fb259
Xin Li [Wed, 30 Oct 2019 18:50:44 +0000 (11:50 -0700)]
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@
5915889 into stage-aosp-master
Bug:
142003500
Change-Id: Iecbfb34019dfbaa82e7c7947c849deb67ceb4da4
Daichi Hirono [Wed, 30 Oct 2019 07:02:54 +0000 (00:02 -0700)]
Merge "Revert "Check ro.treble.enabled for legacy devices""
am:
a9dc08c8cd
Change-Id: I7812fde519f6da46699a966d0b1e0f0c418956f4
Treehugger Robot [Wed, 30 Oct 2019 06:53:37 +0000 (06:53 +0000)]
Merge "Revert "Check ro.treble.enabled for legacy devices""
Daichi Hirono [Wed, 30 Oct 2019 04:56:35 +0000 (04:56 +0000)]
Revert "Check ro.treble.enabled for legacy devices"
This reverts commit
7343a1dc1513036c3122874076db43878037c18f.
Reason for revert: Broke some device boot
Change-Id: I3ebc423a88155652d4aa78f6fbf13faef0c911cb
Jooyung Han [Wed, 30 Oct 2019 04:37:50 +0000 (21:37 -0700)]
Merge "Revert "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk"""""
am:
097dd3b20c
Change-Id: If235bb31a909e72673493d7bd192b3ec03b46818
Treehugger Robot [Wed, 30 Oct 2019 04:29:37 +0000 (04:29 +0000)]
Merge "Revert "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk"""""
Daichi Hirono [Tue, 29 Oct 2019 23:55:04 +0000 (16:55 -0700)]
Merge "Check ro.treble.enabled for legacy devices"
am:
990dfcffdc
Change-Id: Ib76cac35c2f438f5a30d31f18e3c1aa4a094b326
Treehugger Robot [Tue, 29 Oct 2019 23:42:23 +0000 (23:42 +0000)]
Merge "Check ro.treble.enabled for legacy devices"
Daichi Hirono [Tue, 29 Oct 2019 08:33:01 +0000 (17:33 +0900)]
Check ro.treble.enabled for legacy devices
If ro.treble.enabled is "false", the device should use legacy config.
Bug:
143495511
Test: None
Change-Id: I913df5b9feedffa6474527a3ca17d4852e631cb5
Jooyung Han [Mon, 28 Oct 2019 21:08:26 +0000 (21:08 +0000)]
Revert "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk""""
This reverts commit
97599dbfeeaaae6d21fe4614753ac6198e3f4e2e.
Reason for revert: Fix b/
143374795
Change-Id: I156a51435af052a3aae405c74f2a37717bdead5f
Greg Kaiser [Mon, 28 Oct 2019 17:20:09 +0000 (10:20 -0700)]
Merge "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk""""
am:
54de6a01ed
Change-Id: I75ef6ecc7564c457dcff265694c552a6766c2ff0
Greg Kaiser [Mon, 28 Oct 2019 17:12:33 +0000 (17:12 +0000)]
Merge "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk""""
Jooyung Han [Mon, 28 Oct 2019 05:08:19 +0000 (05:08 +0000)]
Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk"""
This reverts commit
908c05068cde21bc80fa065a4268bc24c93f7104.
Reason for revert: b/
143374795
Change-Id: I7fc765717e0a8c367829ae2781209d4a92b69d71
Jooyung Han [Fri, 25 Oct 2019 08:31:19 +0000 (01:31 -0700)]
Merge "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk"""
am:
4125e37c3b
Change-Id: Icd8e9f3b7d7fc0b6e40ea081e959ae9a8067eb78
Jooyung Han [Fri, 25 Oct 2019 08:21:13 +0000 (08:21 +0000)]
Merge "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk"""
Jooyung Han [Fri, 18 Oct 2019 06:58:55 +0000 (15:58 +0900)]
Revert "Revert "Use VNDK APEX instead of /system/lib/vndk""
This reverts commit
a98213baf744c0389c4a1bbe85a8f89720f34420.
Bug:
141451661
Test: m && boot (tested with cuttlefish)
Test: atest CtsNNAPITestCases (this failed with original topic)
Change-Id: I8d7f3c0b35430a0e8fc7857deb9536012c5995af
Jooyung Han [Thu, 17 Oct 2019 12:08:30 +0000 (05:08 -0700)]
Merge "Revert "Use VNDK APEX instead of /system/lib/vndk""
am:
1324ac1552
Change-Id: I2deacb5c3469e2c1ba65598c6e8682b7768e6248
Treehugger Robot [Thu, 17 Oct 2019 11:50:47 +0000 (11:50 +0000)]
Merge "Revert "Use VNDK APEX instead of /system/lib/vndk""
Kiyoung Kim [Thu, 17 Oct 2019 11:18:32 +0000 (04:18 -0700)]
Merge "Do not expose namespace vector"
am:
2c9326fd9b
Change-Id: I8df56552dbfdcd7f93d764c9cacc49c2ca6fe12f
Treehugger Robot [Thu, 17 Oct 2019 11:13:03 +0000 (11:13 +0000)]
Merge "Do not expose namespace vector"
Kiyoung Kim [Thu, 17 Oct 2019 08:14:51 +0000 (01:14 -0700)]
Merge "Support legacy and vndklite mode"
am:
5cdad7a708
Change-Id: I2405cd71c559953f735b16de39b48699ef8c5066
Kiyoung Kim [Thu, 17 Oct 2019 06:54:04 +0000 (06:54 +0000)]
Merge "Support legacy and vndklite mode"
Kiyoung Kim [Mon, 30 Sep 2019 07:58:39 +0000 (16:58 +0900)]
Support legacy and vndklite mode
Support legacy and vndklite linker configuration. This program will
generate these configurations based on the property - ro.vndk.version
and ro.vndk.lite
Bug:
139638519
Bug:
139639353
Test: m -j && atest passed
Test: Generated from cuttlefish and compared from original content
Change-Id: I4461a4bd8befce0ffdc6b1a7f644650902320eb5
Kiyoung Kim [Tue, 15 Oct 2019 10:42:37 +0000 (19:42 +0900)]
Do not expose namespace vector
To avoid abnormal usage with namespace vector, create ForAllNamespaces
function instead of get function returns namespace vector
Test: m -j && atest passed
Test: tested from cuttlefish
Change-Id: Ic5efbb0575d8f8c71746edd142a361c931157654
Jooyung Han [Wed, 16 Oct 2019 22:34:27 +0000 (22:34 +0000)]
Revert "Use VNDK APEX instead of /system/lib/vndk"
This reverts commit
f5f85e3619c5b24165a455d99a3285dac63c3025.
Reason for revert: some targets are broken
Bug:
142773030
Change-Id: I0302ba35f354de6feb2a42b70acb65e70ba0c224
Jooyung Han [Tue, 15 Oct 2019 09:44:14 +0000 (02:44 -0700)]
Use VNDK APEX instead of /system/lib/vndk
am:
f5f85e3619
Change-Id: Ie099c9b6f969a2c22489c6e05037991ba3c9f57e
Jooyung Han [Thu, 26 Sep 2019 14:29:39 +0000 (23:29 +0900)]
Use VNDK APEX instead of /system/lib/vndk
With VNDK APEX, the path to VNDK libs is changed from
/system/lib/vndk-VER to /apex/com.android.vndk.vVER/lib
Bug:
141451661
Test: m && boot (tested with cuttlefish)
Change-Id: Id92532767d8c3aa20c3aff72a9ee0602aa0be8d3
Martin Stjernholm [Tue, 8 Oct 2019 11:13:52 +0000 (04:13 -0700)]
Ensure all namespaces have links to /system/lib(64) for the sanitizer libs.
am:
cb9df4f63e
Change-Id: Ifdf4ac4ff399ca3b13dfdfc12371eab78b8cb888
Martin Stjernholm [Tue, 8 Oct 2019 11:13:49 +0000 (04:13 -0700)]
Make link creation additive.
am:
7f8f6a08fa
Change-Id: I841d1de0755ee42a611bc4a9bceb4abc2abf4ab1
Martin Stjernholm [Tue, 8 Oct 2019 03:57:21 +0000 (20:57 -0700)]
Rename the runtime linker namespace following ART/Runtime APEX split.
am:
f02d5d69a6
Change-Id: I5354597fad998b022e5aff513c5a9392a36cb975
Martin Stjernholm [Wed, 2 Oct 2019 19:47:12 +0000 (20:47 +0100)]
Ensure all namespaces have links to /system/lib(64) for the sanitizer libs.
Every namespace that have links to Bionic should also link to
SANITIZER_RUNTIME_LIBRARIES, without exception. Hence a common function
ctx.AddStandardSystemLinks is added to handle it.
Also remove links to the runtime namespace, since all sanitizer libs,
including the hwasan one, now should be loaded from /system/lib(64).
Test: atest system/linkerconfig/
Test: m linkerconfig && \
out/host/linux-x86/bin/linkerconfig --root out/target/product/taimen --vndk R
before and after change, check that the diffs are expected:
http://gpaste/
4942871205511168
Bug:
140790209
Change-Id: Ib5315b59c22703da295a5ef6d556c0a945f872af
Martin Stjernholm [Sat, 5 Oct 2019 17:15:35 +0000 (18:15 +0100)]
Make link creation additive.
Replace CreateLink with GetLink, which returns the existing link if any, or
else creates it. Also set allow_all_shared_libs separately, which will
override any list of explicitly set libs. This makes link creation additive:
different functions may add links, or set allow_all_shared_libs, without
knowledge of each other.
Test: m linkerconfig && \
out/host/linux-x86/bin/linkerconfig --root out/target/product/taimen --vndk R
before and after the change, and check that there are no diffs.
Test: atest system/linkerconfig/
Bug:
140790209
Change-Id: Ida8acf0b003797df4945359c43de7e8819c4166e
Martin Stjernholm [Wed, 2 Oct 2019 14:28:11 +0000 (15:28 +0100)]
Rename the runtime linker namespace following ART/Runtime APEX split.
Also carry over the applicable TODOs and other comments from ld.config.txt
for the art namespace.
Test: Build & boot
Bug:
139408016
Change-Id: Ib33d544ab6a2871c4b6ff64fb10e7925ede5ace6
Jiyong Park [Thu, 3 Oct 2019 11:47:41 +0000 (04:47 -0700)]
Add a link from runtime ns to the neuralnetworks ns
am:
03ab249d1b
Change-Id: I1448bd36793f5c35c836d86ad0cef90205b115ba
Jiyong Park [Wed, 2 Oct 2019 07:01:35 +0000 (16:01 +0900)]
Add a link from runtime ns to the neuralnetworks ns
libneuralnetworks.so could be preloaded. In that case, it should be
accessible from libnativeloader which runs in the runtime namespace.
Bug:
141847343
Test: m, device boots
Change-Id: Ie1e17a433fb64cc31d1bbc7fa8945fa36c82aea8
Kiyoung Kim [Tue, 1 Oct 2019 11:31:31 +0000 (04:31 -0700)]
Trim whitespace while loading library list file am:
f74c2b7afb am:
bfe922cff5
am:
cdf5509659
Change-Id: If5b8edeec53cf02d360ded50066ae6b187c83dcd
Kiyoung Kim [Tue, 1 Oct 2019 11:23:59 +0000 (04:23 -0700)]
Trim whitespace while loading library list file am:
f74c2b7afb
am:
bfe922cff5
Change-Id: I4013047d5213267510067b7cdc37865429839b52
Kiyoung Kim [Tue, 1 Oct 2019 11:14:55 +0000 (04:14 -0700)]
Trim whitespace while loading library list file
am:
f74c2b7afb
Change-Id: I82c94fc5a3899dfaae2b1d8800863742d46ba337
Kiyoung Kim [Fri, 27 Sep 2019 08:45:10 +0000 (17:45 +0900)]
Trim whitespace while loading library list file
Trim leading and trailing whitespaces from library list file to get
exact library file name
Bug:
141695559
Test: m -j && atest passed
Change-Id: I26078597323229f01e3d88f05188a7a717f3cf2c
Kiyoung Kim [Mon, 30 Sep 2019 02:24:17 +0000 (19:24 -0700)]
Load VNDK using core variant library list am:
18eb4c6465 am:
50e4b94b77
am:
6856c3e758
Change-Id: I9fbc7525ea72cef07242175598942a9994e00d73
Kiyoung Kim [Mon, 30 Sep 2019 02:17:41 +0000 (19:17 -0700)]
Load VNDK using core variant library list am:
18eb4c6465
am:
50e4b94b77
Change-Id: I415499ce5fe7ffe710d9303ec8d1d54f534030a0
Kiyoung Kim [Mon, 30 Sep 2019 01:59:16 +0000 (18:59 -0700)]
Load VNDK using core variant library list
am:
18eb4c6465
Change-Id: Ib4ec2ccc907865e0d1cfcf94d6523a41770e739f
Kiyoung Kim [Fri, 27 Sep 2019 05:06:54 +0000 (14:06 +0900)]
Load VNDK using core variant library list
VNDK_USING_CORE_VARIANT is not implemented previously as it is only
handled from specific devices. To handle this properly new logic is
added to load library list from library list file in system image.
Bug:
141695559
Test: m -j passed & Tested from Cuttlefish
Change-Id: Idfbcda5ff99bfb1dc13c35da06b977b5b5ea0494
Jooyung Han [Fri, 27 Sep 2019 02:32:53 +0000 (19:32 -0700)]
Make linkerconfig support host am:
a3d5d09fda am:
0bfd139c94
am:
fc18ec24f3
Change-Id: I27c4ebf71ee5484784ee6e64b3a9c0e5c2d574a5
Jooyung Han [Fri, 27 Sep 2019 02:25:35 +0000 (19:25 -0700)]
Make linkerconfig support host am:
a3d5d09fda
am:
0bfd139c94
Change-Id: I22127c801d4391640fc7117969fbdee578a5eaef
Jooyung Han [Fri, 27 Sep 2019 02:19:17 +0000 (19:19 -0700)]
Make linkerconfig support host
am:
a3d5d09fda
Change-Id: I4652947c62c20d8263bef4f94f995cafe055c7ba
Jooyung Han [Thu, 26 Sep 2019 14:23:50 +0000 (23:23 +0900)]
Make linkerconfig support host
By supplying two additional args for host running
--root <root dir>
--vndk <vndk version>
one can run linkerconfig and see the resulting ld.config.txt
Some input files are found under <root>/system/etc with <vndk version>.
For example, out/target/vsoc_x86/system/etc/llndk.libraries.29.txt
Bug:
141660636
Test: m linkerconfig
Test: linkerconfig --root $OUT --vndk 29
Change-Id: I4aeab731a17764d7aa7e508842eae620f55f781e
Kiyoung Kim [Thu, 26 Sep 2019 04:30:17 +0000 (21:30 -0700)]
Add libneuralnetworks_packageinfo.so in neuralnetworks link am:
d1861bc9f4 am:
c35045632f
am:
96d3e3c7cd
Change-Id: I983da9124a87dbb4455d18f6435bc0fd3f021b16
Kiyoung Kim [Thu, 26 Sep 2019 04:30:12 +0000 (21:30 -0700)]
Maintain directory to section map in manual am:
360a6f3367 am:
faa32ee3f1
am:
1b19641307
Change-Id: I2cf1c30612549262ef92c484dbddb5a7440adb6b
Kiyoung Kim [Thu, 26 Sep 2019 04:22:22 +0000 (21:22 -0700)]
Add libneuralnetworks_packageinfo.so in neuralnetworks link am:
d1861bc9f4
am:
c35045632f
Change-Id: Ibbcb95977398915bc440eeea1de51076911e96e7
Kiyoung Kim [Thu, 26 Sep 2019 04:22:18 +0000 (21:22 -0700)]
Maintain directory to section map in manual am:
360a6f3367
am:
faa32ee3f1
Change-Id: I51fca94dc96d097a9a5449a382904e858b110e59
Kiyoung Kim [Thu, 26 Sep 2019 04:15:00 +0000 (21:15 -0700)]
Add libneuralnetworks_packageinfo.so in neuralnetworks link
am:
d1861bc9f4
Change-Id: I9ecab0b021002970f29bd239fd2778024c59ac48
Kiyoung Kim [Thu, 26 Sep 2019 04:14:56 +0000 (21:14 -0700)]
Maintain directory to section map in manual
am:
360a6f3367
Change-Id: Ic299e37e28168c5c57f2d19539ab2bc07fd918f9
Kiyoung Kim [Wed, 25 Sep 2019 04:08:20 +0000 (13:08 +0900)]
Add libneuralnetworks_packageinfo.so in neuralnetworks link
Link to libneuralnetworks_packageinfo.so is added in ld.config.txt but
missed from linker config generator.
Adding this to fix linking issue from neuralnetworks.
Bug:
139282353
Test: m -j && atest passed
Change-Id: I1fa58f645a348e6a8760b3e51fd5837ff1a3161f
Kiyoung Kim [Tue, 24 Sep 2019 06:35:54 +0000 (15:35 +0900)]
Maintain directory to section map in manual
Order of directory to section map was maintained automatically in
reverse dictionary order. However, this made a problem that /vendor/bin
comes first which caused sepolicy errors from system binaries. To
resolve this kinds of issues, order of map should be maintained in
manual.
Bug:
141524071
Test: m -j && atest passed
Test: Tested from Cuttlefish
Change-Id: Ibb4364e15eee63ac0af30c20e808847f2cdcf1e8
Kiyoung Kim [Wed, 11 Sep 2019 04:08:15 +0000 (21:08 -0700)]
Merge "Create full test for ld.config.txt content" am:
9112ee5e03 am:
3a768552a1
am:
29da463c0e
Change-Id: I991d05ddab1be24bf419059d7de36081cd0f4ca7
Kiyoung Kim [Wed, 11 Sep 2019 03:58:01 +0000 (20:58 -0700)]
Merge "Create full test for ld.config.txt content" am:
9112ee5e03
am:
3a768552a1
Change-Id: I5d8f70f81eaa052f00cfd3879ffeb923a408ccc0
Kiyoung Kim [Wed, 11 Sep 2019 03:52:00 +0000 (20:52 -0700)]
Merge "Create full test for ld.config.txt content"
am:
9112ee5e03
Change-Id: Ie7a315a04be50bf721db9a0a2112c0c3b0ad8f40
Kiyoung Kim [Wed, 11 Sep 2019 03:26:38 +0000 (03:26 +0000)]
Merge "Create full test for ld.config.txt content"
Xin Li [Sun, 8 Sep 2019 23:38:12 +0000 (16:38 -0700)]
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (
5817612) into stage-aosp-master am:
2f2cd0197d -s ours
am:
2b10195503 -s ours
am skip reason: change_id Ide52d2c81bdfce77ea8653a210842fcbc2c886c6 with SHA1
8f236929a4 is in history
Change-Id: Ib536e40902bf0ac8bf515e293c867f4945a8be5a
Xin Li [Sun, 8 Sep 2019 22:50:34 +0000 (15:50 -0700)]
[automerger skipped] Merge qt-r1-dev-plus-aosp-without-vendor (
5817612) into stage-aosp-master
am:
2f2cd0197d -s ours
am skip reason: change_id Ide52d2c81bdfce77ea8653a210842fcbc2c886c6 with SHA1
8f236929a4 is in history
Change-Id: I8d40d3f9087132720ec7e91645511d452f6125f8
Xin Li [Sun, 8 Sep 2019 19:45:57 +0000 (12:45 -0700)]
Merge qt-r1-dev-plus-aosp-without-vendor (
5817612) into stage-aosp-master
No content change.
Bug:
135460123
Change-Id: Ia4aa80240a2870b59f31afea020f54fbf384c2aa
Merged-In: Ide52d2c81bdfce77ea8653a210842fcbc2c886c6
Martin Stjernholm [Fri, 6 Sep 2019 00:52:30 +0000 (17:52 -0700)]
Merge "Update path to the new ART APEX." am:
3f06c554cf am:
8f236929a4 am:
5cc2a9fe37
am:
2baaff557d
Change-Id: I947fc0135878953cc3e570e88e7c727a30a6f370
Martin Stjernholm [Fri, 6 Sep 2019 00:30:13 +0000 (17:30 -0700)]
Merge "Update path to the new ART APEX." am:
3f06c554cf am:
8f236929a4
am:
5cc2a9fe37
Change-Id: Ic24d345a21b7e3305c9519e1670f70ba3b92f57b
Martin Stjernholm [Fri, 6 Sep 2019 00:22:11 +0000 (17:22 -0700)]
Merge "Update path to the new ART APEX." am:
3f06c554cf
am:
8f236929a4
Change-Id: I21a62ab4ce0dd91ff3d59de8856100a42069e90f
Martin Stjernholm [Fri, 6 Sep 2019 00:08:08 +0000 (17:08 -0700)]
Merge "Update path to the new ART APEX."
am:
3f06c554cf
Change-Id: Ide52d2c81bdfce77ea8653a210842fcbc2c886c6
Treehugger Robot [Thu, 5 Sep 2019 23:35:22 +0000 (23:35 +0000)]
Merge "Update path to the new ART APEX."
Kiyoung Kim [Wed, 21 Aug 2019 10:46:51 +0000 (19:46 +0900)]
Create full test for ld.config.txt content
There are some module level unit tests and backward compatibility tests,
but still there is no test that verifies ld.config.txt content is
valid in terms of syntax and also context. To test both
features in basic level, this change adds full content test which parses
content and checks if every context (such as path exists and links
between namespace is valid) is able to be used by linker.
Bug:
139639353
Test: m -j && atest passed
Change-Id: I58255ccc6602f6bcb86b897fc89f5581ccc18f08
Martin Stjernholm [Wed, 17 Jul 2019 21:26:30 +0000 (22:26 +0100)]
Update path to the new ART APEX.
Test: atest system/linkerconfig/
Test: presubmits
Bug:
135753770
Change-Id: I5ed3907fdddcbe9d720af41b01183f446e899acd
Jooyung Han [Thu, 29 Aug 2019 17:01:22 +0000 (10:01 -0700)]
Merge "remove link from rs to vndk" am:
5fc7297464 am:
4dd62fd224 am:
6b7415ee50
am:
aea5dba690
Change-Id: I7337ddac25f5eeac5674c4c65457a80b43d221f7
Jooyung Han [Thu, 29 Aug 2019 16:55:31 +0000 (09:55 -0700)]
Merge "remove link from rs to vndk" am:
5fc7297464 am:
4dd62fd224
am:
6b7415ee50
Change-Id: If9efd49c2e6263bb2f11291f5e1b5e35987a0bf9
Jooyung Han [Thu, 29 Aug 2019 16:46:52 +0000 (09:46 -0700)]
Merge "remove link from rs to vndk" am:
5fc7297464
am:
4dd62fd224
Change-Id: I52aca23daa3520968197b2b77a46fdfaeb8f61ea
Jooyung Han [Thu, 29 Aug 2019 16:40:46 +0000 (09:40 -0700)]
Merge "remove link from rs to vndk"
am:
5fc7297464
Change-Id: I8f3dacbeaad0c0c308c3e798cf8f49e9a3b68bbd
Treehugger Robot [Thu, 29 Aug 2019 16:18:27 +0000 (16:18 +0000)]
Merge "remove link from rs to vndk"
Kiyoung Kim [Wed, 21 Aug 2019 02:33:25 +0000 (19:33 -0700)]
Use enum for ASAN path am:
405bfc9ac2 am:
0990870378 am:
41df97507f
am:
b1ed34a4dd
Change-Id: I10589e5060f4de3e985864509d4da34c2056f353
Kiyoung Kim [Wed, 21 Aug 2019 02:23:36 +0000 (19:23 -0700)]
Use enum for ASAN path am:
405bfc9ac2 am:
0990870378
am:
41df97507f
Change-Id: I3f8af3d71981951402e574995ffe330fda349deb
Kiyoung Kim [Wed, 21 Aug 2019 02:10:52 +0000 (19:10 -0700)]
Use enum for ASAN path am:
405bfc9ac2
am:
0990870378
Change-Id: Id0f78350c4765be28e3ad724426939d278268b68
Kiyoung Kim [Wed, 21 Aug 2019 01:58:30 +0000 (18:58 -0700)]
Use enum for ASAN path
am:
405bfc9ac2
Change-Id: I5422a7caae10238d0c4738f552681f549680e564
Jooyung Han [Tue, 20 Aug 2019 07:16:28 +0000 (16:16 +0900)]
remove link from rs to vndk
Linker namespace 'rs' has /system/lib/vndk-sp in its search paths.
So we don't need to link 'rs' namespace to 'vndk' namespace.
Bug:
139706981
Test: run RS-using apps from Play
Change-Id: Ic0d856ff75330086dbf8a75b92c44defa70f0c42
Kiyoung Kim [Fri, 16 Aug 2019 03:54:23 +0000 (12:54 +0900)]
Use enum for ASAN path
Currently there are two boolean arguments for search / permitted path to
define ASAN path, but it is not easy to understand each boolean value
and hard to block invalid case where path does not exist in asan but
data/asan path does. To fix this new enum class has been added to
describe ASAN path preference, so it can add more readability to
configuration codes.
Test: m -j && atest passed
Change-Id: I4688e949a23af013c6db06df2dd471cfd442e4e8
Kiyoung Kim [Tue, 13 Aug 2019 02:10:17 +0000 (19:10 -0700)]
Update linkerconfig up to date am:
ac298bb8b9 am:
5f70da9b82 am:
aec23f4174
am:
cc72aa1871
Change-Id: I78fdcdb5bcd9db50ef8318fd9e6eecd63c501f5d
Kiyoung Kim [Tue, 13 Aug 2019 01:47:36 +0000 (18:47 -0700)]
Update linkerconfig up to date am:
ac298bb8b9 am:
5f70da9b82
am:
aec23f4174
Change-Id: I44148fb2fce23271c4ad5a594acc66eb9ce5f884
Kiyoung Kim [Tue, 13 Aug 2019 01:36:11 +0000 (18:36 -0700)]
Update linkerconfig up to date am:
ac298bb8b9
am:
5f70da9b82
Change-Id: I90ac221bf3afc2e8ad50be9eb28eaec87ec23ff8
Kiyoung Kim [Tue, 13 Aug 2019 01:25:47 +0000 (18:25 -0700)]
Update linkerconfig up to date
am:
ac298bb8b9
Change-Id: Ie59e57ba1474b87db818d706fed5fe30458f58e4
Kiyoung Kim [Fri, 9 Aug 2019 10:11:56 +0000 (03:11 -0700)]
Resolve dir path in early stage am:
eba3ed1a97 am:
e02550cfcf am:
71745b43f3
am:
b9ce433e3c
Change-Id: Ic2a64f9c85baa85e1ce8c84754d5ff373459b1d3
Kiyoung Kim [Fri, 9 Aug 2019 10:02:16 +0000 (03:02 -0700)]
Resolve dir path in early stage am:
eba3ed1a97 am:
e02550cfcf
am:
71745b43f3
Change-Id: I9d1a06fc474c872ef931a0ca3ce9a5275747b903
Kiyoung Kim [Fri, 9 Aug 2019 09:51:49 +0000 (02:51 -0700)]
Resolve dir path in early stage am:
eba3ed1a97
am:
e02550cfcf
Change-Id: I232377db34183d34be3e934cd3410c020df22367
Kiyoung Kim [Fri, 9 Aug 2019 09:42:23 +0000 (02:42 -0700)]
Resolve dir path in early stage
am:
eba3ed1a97
Change-Id: Iecd401ef92cb0118cdd85fecab9d933aa0bd2240
Kiyoung Kim [Wed, 7 Aug 2019 10:13:09 +0000 (19:13 +0900)]
Update linkerconfig up to date
Current implementation is based on old ld.config.txt, so it should be up
to date before actually being used. This change keeps generated
ld.config.txt same with current one under /system/etc
Test: m -j && Cuttlefish, compared with ld.config.txt from latest master
Change-Id: If739c907cc21c4572d5e22edfa18f6b3d04e3aa6
Kiyoung Kim [Wed, 7 Aug 2019 10:10:17 +0000 (19:10 +0900)]
Resolve dir path in early stage
Linkerconfig generator sorts dir path in revert order, so when a dir is
subdirectory of other dir, then subdirectory can be mentioned earlier.
However, this sorting occured before resolving environmental variables,
so this list was failing to be kept in actual reverse order. To fix this
issue, dir path should be resolved before it is collected by generator.
Test: m -j && tested from cuttlefish
Change-Id: I21f88cca25fef37e080dc1c1cb68e7a0c0186b4f