OSDN Git Service

android-x86/system-linkerconfig.git
4 years agoMerge "Remove unnecessary shared_lib for neuralnetworks" am: e57f17f4b0 am: 57589c52ad
Jooyung Han [Tue, 10 Dec 2019 00:21:17 +0000 (16:21 -0800)]
Merge "Remove unnecessary shared_lib for neuralnetworks" am: e57f17f4b0 am: 57589c52ad
am: 3399be80c7

Change-Id: I185da62bf9f7caeadc9aa5306b0e035127efd106

4 years agoMerge "Remove unnecessary shared_lib for neuralnetworks" am: e57f17f4b0
Jooyung Han [Tue, 10 Dec 2019 00:16:13 +0000 (16:16 -0800)]
Merge "Remove unnecessary shared_lib for neuralnetworks" am: e57f17f4b0
am: 57589c52ad

Change-Id: I33a5dccaa0c77b0d0babcad11f2ae68d5fd969f4

4 years agoMerge "Remove unnecessary shared_lib for neuralnetworks"
Jooyung Han [Tue, 10 Dec 2019 00:09:15 +0000 (16:09 -0800)]
Merge "Remove unnecessary shared_lib for neuralnetworks"
am: e57f17f4b0

Change-Id: Id2f1dceba3a218db98c3b1c6fc5dd983f962e308

4 years agoMerge "Remove unnecessary shared_lib for neuralnetworks"
Treehugger Robot [Mon, 9 Dec 2019 23:19:24 +0000 (23:19 +0000)]
Merge "Remove unnecessary shared_lib for neuralnetworks"

4 years agoLinker configuration for recovery am: 09cbb08096 am: afb1699289
Kiyoung Kim [Sun, 8 Dec 2019 14:06:53 +0000 (06:06 -0800)]
Linker configuration for recovery am: 09cbb08096 am: afb1699289
am: 8b131fc79a

Change-Id: Iead4cbf4fedd6e6a395c05d7ad9d537fd7d74b8b

4 years agoLinker configuration for recovery am: 09cbb08096
Kiyoung Kim [Sun, 8 Dec 2019 14:04:39 +0000 (06:04 -0800)]
Linker configuration for recovery am: 09cbb08096
am: afb1699289

Change-Id: Ic28c6e90270097ca856fa0369076efcedfa270b1

4 years agoLinker configuration for recovery
Kiyoung Kim [Sun, 8 Dec 2019 14:02:21 +0000 (06:02 -0800)]
Linker configuration for recovery
am: 09cbb08096

Change-Id: Iffffa168e744891783ecbdcc4e241df66cff73bc

4 years agoLinker configuration for recovery
Kiyoung Kim [Thu, 5 Dec 2019 07:44:34 +0000 (16:44 +0900)]
Linker configuration for recovery

Implements linker configuration for recovery. Linkerconfig will generate
recovery configuration on --recovery argument.

Bug: 139638519
Test: m -j passed & tested from crosshatch
Change-Id: I02a38bde8075167dd67334d69507f2604b7d3b33

4 years agoRemove unnecessary shared_lib for neuralnetworks
Jooyung Han [Wed, 4 Dec 2019 14:57:58 +0000 (23:57 +0900)]
Remove unnecessary shared_lib for neuralnetworks

Because libneuralnetworks doesn't require libsync.so, remove it from
allowed shared_libs list.

Bug: 144659031
Test: CtsNNAPITestCases
Change-Id: Ica410d01dd54881b2e5cfdd32013c0f11caa0511

4 years agoMerge "Remove unnecessary shared_libs for resolv APEX" am: 74517fccd7 am: bd60e089ab
Automerger Merge Worker [Wed, 4 Dec 2019 13:45:08 +0000 (13:45 +0000)]
Merge "Remove unnecessary shared_libs for resolv APEX" am: 74517fccd7 am: bd60e089ab

Change-Id: I32ab223128c2cefa1b320fac1ffb298f389d5c44

4 years agoMerge "Remove unnecessary shared_libs for resolv APEX" am: 74517fccd7
Jooyung Han [Wed, 4 Dec 2019 13:35:51 +0000 (05:35 -0800)]
Merge "Remove unnecessary shared_libs for resolv APEX" am: 74517fccd7
am: ad1fca9de7

Change-Id: I7a8d5376af2a506d7eb37dfb7c0591a975f0a073

4 years agoMerge "Remove unnecessary shared_libs for resolv APEX"
Jooyung Han [Wed, 4 Dec 2019 13:33:58 +0000 (05:33 -0800)]
Merge "Remove unnecessary shared_libs for resolv APEX"
am: 74517fccd7

Change-Id: I8a3e714de6efbd6251f348bfa34333988b128171

4 years agoMerge "Remove unnecessary shared_libs for resolv APEX"
Jooyung Han [Wed, 4 Dec 2019 13:27:36 +0000 (13:27 +0000)]
Merge "Remove unnecessary shared_libs for resolv APEX"

4 years agoAdd path to the boot image in the ART apex. am: 35eda21c8c am: e49dafaaec
Automerger Merge Worker [Tue, 3 Dec 2019 17:41:17 +0000 (17:41 +0000)]
Add path to the boot image in the ART apex. am: 35eda21c8c am: e49dafaaec

Change-Id: I29323b93fa8cb04ddb389ce5a42d69acb225a061

4 years agoAdd jooyung to owners am: bc1f4094a4 am: f8b4ccee6b
Automerger Merge Worker [Tue, 3 Dec 2019 17:37:18 +0000 (17:37 +0000)]
Add jooyung to owners am: bc1f4094a4 am: f8b4ccee6b

Change-Id: I0ecfd9f8be80824fba4691e7597346cb873ef0a8

4 years agoAdd path to the boot image in the ART apex. am: 35eda21c8c
Ulya Trafimovich [Tue, 3 Dec 2019 16:55:47 +0000 (08:55 -0800)]
Add path to the boot image in the ART apex. am: 35eda21c8c
am: 5d69eaca4a

Change-Id: I4180158fe5ead39faa18f5a4abbf4b24d0348111

4 years agoAdd jooyung to owners am: bc1f4094a4
Kiyoung Kim [Tue, 3 Dec 2019 16:55:39 +0000 (08:55 -0800)]
Add jooyung to owners am: bc1f4094a4
am: 766eabae1f

Change-Id: Ia9243ce5b7162051466eca6e8ed34a45b0ed5760

4 years agoAdd path to the boot image in the ART apex.
Ulya Trafimovich [Tue, 3 Dec 2019 16:47:24 +0000 (08:47 -0800)]
Add path to the boot image in the ART apex.
am: 35eda21c8c

Change-Id: I5aa5ea072300475dc1a06316847bd3ba1a64189e

4 years agoAdd jooyung to owners
Kiyoung Kim [Tue, 3 Dec 2019 16:44:25 +0000 (08:44 -0800)]
Add jooyung to owners
am: bc1f4094a4

Change-Id: I2aa9462159b4230a5f8dee6b34f7e779f3617880

4 years agoRemove unnecessary shared_libs for resolv APEX
Jooyung Han [Tue, 3 Dec 2019 10:38:22 +0000 (19:38 +0900)]
Remove unnecessary shared_libs for resolv APEX

resolv APEX doesn't need libcgrouprc.so, liblog.so, and libvndksupport.so.

Bug: 144659031
Test: m && device boot
      atest --test-mapping system/netd
Change-Id: Ic06008b808a185f5f5662f1758363fe776dbda45

4 years agoAdd path to the boot image in the ART apex.
Ulya Trafimovich [Fri, 15 Nov 2019 14:10:02 +0000 (14:10 +0000)]
Add path to the boot image in the ART apex.

Test: m

Change-Id: Ia92ae90b7d80fab9ad87207c0f699292451e8578

4 years agoAdd jooyung to owners
Kiyoung Kim [Tue, 3 Dec 2019 06:31:17 +0000 (15:31 +0900)]
Add jooyung to owners

Add jooyung@ to OWNERS list.

Test: no test required
Change-Id: I9bd783cadf7c324f728c1264cb082562db0a7678

4 years agoMerge "Add ART module members to linkerconfig owners." am: 0c04afcb05 am: ccac09614a
Nicolas Geoffray [Mon, 2 Dec 2019 08:38:30 +0000 (00:38 -0800)]
Merge "Add ART module members to linkerconfig owners." am: 0c04afcb05 am: ccac09614a
am: 4b6ac07639

Change-Id: I234ef0957e10a680815a76f629b1f605a2171d9a

4 years agoMerge "Add ART module members to linkerconfig owners." am: 0c04afcb05
Nicolas Geoffray [Mon, 2 Dec 2019 08:36:18 +0000 (00:36 -0800)]
Merge "Add ART module members to linkerconfig owners." am: 0c04afcb05
am: ccac09614a

Change-Id: I6f81467d7fcc8a8ddc25f19c576cfca837054eee

4 years agoMerge "Add ART module members to linkerconfig owners."
Nicolas Geoffray [Mon, 2 Dec 2019 08:34:05 +0000 (00:34 -0800)]
Merge "Add ART module members to linkerconfig owners."
am: 0c04afcb05

Change-Id: Icee5851c6ddb7c28ae7fba553ae68ec2920cbbd8

4 years agoMerge "Add ART module members to linkerconfig owners."
Nicolas Geoffray [Mon, 2 Dec 2019 08:31:08 +0000 (08:31 +0000)]
Merge "Add ART module members to linkerconfig owners."

4 years agoAdd ART module members to linkerconfig owners.
Nicolas Geoffray [Fri, 29 Nov 2019 09:44:40 +0000 (09:44 +0000)]
Add ART module members to linkerconfig owners.

Test: build/make/tools/checkowners.py -c system/linkerconfig/OWNERS
Change-Id: Icd285aa36ffb560df2700ed09223ca9f082e7ee5

4 years agoAdd /system/lib to the permitted paths for ns of APEXes am: 406aa34b07 am: 4d1d8b6091
Jiyong Park [Mon, 2 Dec 2019 08:19:37 +0000 (00:19 -0800)]
Add /system/lib to the permitted paths for ns of APEXes am: 406aa34b07 am: 4d1d8b6091
am: 11e81c081c

Change-Id: I566ca2b7e76da2772eba6a531e461b0bde9c0e54

4 years agoAdd /system/lib to the permitted paths for ns of APEXes am: 406aa34b07
Jiyong Park [Mon, 2 Dec 2019 08:17:19 +0000 (00:17 -0800)]
Add /system/lib to the permitted paths for ns of APEXes am: 406aa34b07
am: 4d1d8b6091

Change-Id: I14c02e8e0bd1bdecd54dce51a9961b3a19b09d44

4 years agoAdd /system/lib to the permitted paths for ns of APEXes
Jiyong Park [Mon, 2 Dec 2019 08:15:01 +0000 (00:15 -0800)]
Add /system/lib to the permitted paths for ns of APEXes
am: 406aa34b07

Change-Id: I64fa27f23235959873494bd8fa5adb3a6a83f6cd

4 years agoAdd /system/lib to the permitted paths for ns of APEXes
Jiyong Park [Fri, 22 Nov 2019 13:11:58 +0000 (22:11 +0900)]
Add /system/lib to the permitted paths for ns of APEXes

With b/144533348, there will be symlinks from libs in APEXes to the libs
in the system partition. This is to reduce the size of APEXes when the
APEX is bundled with the platform.

Adding the /system/lib to the permitted paths so that the realpaths of
the symlinks are allowed for the namespaces.

Note that this however does not open all libs in the system partition to
the APEX namespaces, because searching of the libs are NOT done in
/system/lib, but in /apex/<module>/lib directory.

Bug: 144533348
Test: m
Change-Id: Ieb5dd795f6575123db4575f2a078cf136295b832

4 years agoAdd constraints resolution for dependencies am: b9f20d1929 am: c06cf1c472
Jooyung Han [Fri, 29 Nov 2019 13:31:48 +0000 (05:31 -0800)]
Add constraints resolution for dependencies am: b9f20d1929 am: c06cf1c472
am: 92591485ca

Change-Id: I40eb853fc95b336ba41be9fe2df114676cce8c51

4 years agoAdd constraints resolution for dependencies am: b9f20d1929
Jooyung Han [Fri, 29 Nov 2019 13:29:35 +0000 (05:29 -0800)]
Add constraints resolution for dependencies am: b9f20d1929
am: c06cf1c472

Change-Id: Ia1476a23cc5e05804aa2ea6490c235c9b309c9d2

4 years agoAdd constraints resolution for dependencies
Jooyung Han [Fri, 29 Nov 2019 13:27:16 +0000 (05:27 -0800)]
Add constraints resolution for dependencies
am: b9f20d1929

Change-Id: I7444d7025e31e849b59bd1d48f7919bfa80fb7b2

4 years agoAdd constraints resolution for dependencies
Jooyung Han [Wed, 27 Nov 2019 13:08:46 +0000 (22:08 +0900)]
Add constraints resolution for dependencies

Each namespace may provide some list of libraries to other namespaces
and require some from others. From this constraints, generate mapping
between linker namespaces.

Bug: 144659031
Test: atest --host linkerconfig_modules_unittest
Change-Id: Ib3a948d4c5654557ad03adf8bade98cf527adc0f

4 years agoMerge "Make sure that namespace links are ordered" am: 964d6bddf1 am: 0312c694eb
Jooyung Han [Tue, 19 Nov 2019 08:52:27 +0000 (00:52 -0800)]
Merge "Make sure that namespace links are ordered" am: 964d6bddf1 am: 0312c694eb
am: fa3f492333

Change-Id: I8cabc0d455b77ba7ba8e3446ffdd1c85a7372db5

4 years agoMerge "Make sure that namespace links are ordered" am: 964d6bddf1
Jooyung Han [Tue, 19 Nov 2019 08:49:12 +0000 (00:49 -0800)]
Merge "Make sure that namespace links are ordered" am: 964d6bddf1
am: 0312c694eb

Change-Id: I1968e1eb7e88f44f40be64c1b37f90659ca30ddf

4 years agoMerge "Make sure that namespace links are ordered"
Jooyung Han [Tue, 19 Nov 2019 08:45:53 +0000 (00:45 -0800)]
Merge "Make sure that namespace links are ordered"
am: 964d6bddf1

Change-Id: I2e9791e854653ffd0d75d0572be1532538f6bf54

4 years agoMerge "Make sure that namespace links are ordered"
Treehugger Robot [Tue, 19 Nov 2019 08:36:01 +0000 (08:36 +0000)]
Merge "Make sure that namespace links are ordered"

4 years agoMerge "Add runtime to unrestricted." am: 637bd4d9bd am: 9b8f6f4061
Christopher Ferris [Sat, 16 Nov 2019 16:43:53 +0000 (08:43 -0800)]
Merge "Add runtime to unrestricted." am: 637bd4d9bd am: 9b8f6f4061
am: 3eda638175

Change-Id: I9afa84d1c16ecc3e85bf72231d6ae335925a52a5

4 years agoMerge "Add runtime to unrestricted." am: 637bd4d9bd
Christopher Ferris [Sat, 16 Nov 2019 16:40:22 +0000 (08:40 -0800)]
Merge "Add runtime to unrestricted." am: 637bd4d9bd
am: 9b8f6f4061

Change-Id: I6850c9c0b883d3f3c3937e264234e8b6aa781044

4 years agoMerge "Add runtime to unrestricted."
Christopher Ferris [Sat, 16 Nov 2019 16:36:51 +0000 (08:36 -0800)]
Merge "Add runtime to unrestricted."
am: 637bd4d9bd

Change-Id: I9b9d9b15295b94689a39417d1204c4f50e6a4bc7

4 years agoMerge "Add runtime to unrestricted."
Christopher Ferris [Sat, 16 Nov 2019 16:32:53 +0000 (16:32 +0000)]
Merge "Add runtime to unrestricted."

4 years agoMake sure that namespace links are ordered
Jooyung Han [Fri, 15 Nov 2019 04:48:00 +0000 (13:48 +0900)]
Make sure that namespace links are ordered

Unit test added.

Bug: 144464148
Test: atest --host linkerconfig_modules_unittest
Change-Id: Id23f325b9354d4bf45c4d357e3cda6dbe82ee6d0

4 years agoUse ordered sequences for namespace links am: b461a7bffd am: 92549cf436
Jooyung Han [Fri, 15 Nov 2019 02:34:33 +0000 (18:34 -0800)]
Use ordered sequences for namespace links am: b461a7bffd am: 92549cf436
am: 95b78ca8a1

Change-Id: I37d3396bbfe45dd39b820f8b17a0835e6f037733

4 years agoUse ordered sequences for namespace links am: b461a7bffd
Jooyung Han [Fri, 15 Nov 2019 02:26:40 +0000 (18:26 -0800)]
Use ordered sequences for namespace links am: b461a7bffd
am: 92549cf436

Change-Id: I5fe10e5462627f02fa635efc28a77f6e05e6e727

4 years agoUse ordered sequences for namespace links
Jooyung Han [Fri, 15 Nov 2019 02:19:20 +0000 (18:19 -0800)]
Use ordered sequences for namespace links
am: b461a7bffd

Change-Id: Id6a72654b0844c92fb1df08946a9791ca9934fbd

4 years agoUse ordered sequences for namespace links
Jooyung Han [Thu, 14 Nov 2019 08:14:17 +0000 (17:14 +0900)]
Use ordered sequences for namespace links

The order of namespace links matters since linker searches in order.

Bug: 144464148
Test: atest --host linkerconfig_contents_fulltest
Test: see manually generated ld.config.txt (sphal ns)
Change-Id: Ice3db7060bb7b1b2ebeba9d3a3fcfa22b623ccc6

4 years agoMerge "vndk-ext should come before vndk(VNDK APEX)" am: 1314c36936 am: 9cdc8764a3
Jooyung Han [Thu, 14 Nov 2019 06:14:17 +0000 (22:14 -0800)]
Merge "vndk-ext should come before vndk(VNDK APEX)" am: 1314c36936 am: 9cdc8764a3
am: 8e8f5d298a

Change-Id: If752f089a41d6cbd8994b7050719c47df1f6c9b9

4 years agoMerge "vndk-ext should come before vndk(VNDK APEX)" am: 1314c36936
Jooyung Han [Thu, 14 Nov 2019 06:10:55 +0000 (22:10 -0800)]
Merge "vndk-ext should come before vndk(VNDK APEX)" am: 1314c36936
am: 9cdc8764a3

Change-Id: I907637f833e088d59e2555c6e4e6a1e31a4f56d0

4 years agoMerge "vndk-ext should come before vndk(VNDK APEX)"
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

4 years agoMerge "vndk-ext should come before vndk(VNDK APEX)"
Treehugger Robot [Thu, 14 Nov 2019 05:56:19 +0000 (05:56 +0000)]
Merge "vndk-ext should come before vndk(VNDK APEX)"

4 years agovndk-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

4 years agoAdd runtime to unrestricted.
Christopher Ferris [Thu, 14 Nov 2019 01:12:03 +0000 (17:12 -0800)]
Add runtime to unrestricted.

Without this change, malloc debug and malloc hooks will not work
when executed from /data/local/tmp. This would represent a regression
from Q, and it also mean that atest could not run the system tests.

Also add the malloc debug and malloc hooks tests to this directory.

Test: malloc debug and malloc hooks system tests pass.
Change-Id: I5ecaa2710aef97d6b9468aa005bdf0a74f72014a

4 years agoRetain relevant comments from system/core/rootdir/etc/ld.config.txt. am: 7e36aeaa61...
Martin Stjernholm [Thu, 14 Nov 2019 01:06:19 +0000 (17:06 -0800)]
Retain relevant comments from system/core/rootdir/etc/ld.config.txt. am: 7e36aeaa61 am: 52cde52452
am: 2c4a275aac

Change-Id: I118a296480e5795c30f07372559b0b43dd5ce261

4 years agoRetain relevant comments from system/core/rootdir/etc/ld.config.txt. am: 7e36aeaa61
Martin Stjernholm [Thu, 14 Nov 2019 01:02:06 +0000 (17:02 -0800)]
Retain relevant comments from system/core/rootdir/etc/ld.config.txt. am: 7e36aeaa61
am: 52cde52452

Change-Id: Ieb176eaa1b830bae44d3856456741c5e5fdc199a

4 years agoRetain relevant comments from system/core/rootdir/etc/ld.config.txt.
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

4 years agoRetain relevant comments from system/core/rootdir/etc/ld.config.txt.
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

4 years agoAdd runtime namespace am: 72410b5474 am: 0fd4cc0afb
Jiyong Park [Mon, 11 Nov 2019 05:00:42 +0000 (21:00 -0800)]
Add runtime namespace am: 72410b5474 am: 0fd4cc0afb
am: 4d0dcf633a

Change-Id: I7ee2719eafe27fda4c0760ea77b1f32bc7dc683f

4 years agoAdd runtime namespace am: 72410b5474
Jiyong Park [Mon, 11 Nov 2019 04:56:42 +0000 (20:56 -0800)]
Add runtime namespace am: 72410b5474
am: 0fd4cc0afb

Change-Id: Ib5f13b8682a6e5b20b5c74a05a4caee4edd5b5dc

4 years agoAdd runtime namespace
Jiyong Park [Mon, 11 Nov 2019 04:52:40 +0000 (20:52 -0800)]
Add runtime namespace
am: 72410b5474

Change-Id: I984c724a9e153a2fe950a833b660589a61354a1f

4 years agoAdd runtime namespace
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

4 years agoMerge "Revert "Revert "Check ro.treble.enabled for legacy devices""" am: 8aa4ecefb5...
Daichi Hirono [Thu, 31 Oct 2019 03:51:02 +0000 (20:51 -0700)]
Merge "Revert "Revert "Check ro.treble.enabled for legacy devices""" am: 8aa4ecefb5 am: c19de79551
am: 44292cec18

Change-Id: I7469206539598a3cbca234b82a00934b848a6f13

4 years agoMerge "Revert "Revert "Check ro.treble.enabled for legacy devices""" am: 8aa4ecefb5
Daichi Hirono [Thu, 31 Oct 2019 03:44:29 +0000 (20:44 -0700)]
Merge "Revert "Revert "Check ro.treble.enabled for legacy devices""" am: 8aa4ecefb5
am: c19de79551

Change-Id: Ifa645ca5bda0e78f77088da634ec5084468d557b

4 years agoMerge "Revert "Revert "Check ro.treble.enabled for legacy devices"""
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

4 years agoMerge "Revert "Revert "Check ro.treble.enabled for legacy devices"""
Treehugger Robot [Thu, 31 Oct 2019 03:12:39 +0000 (03:12 +0000)]
Merge "Revert "Revert "Check ro.treble.enabled for legacy devices"""

4 years agoRevert "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

4 years ago[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889...
Xin Li [Wed, 30 Oct 2019 23:27:31 +0000 (16:27 -0700)]
[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 9ea19c6179
am: ef08aec60f -s ours
am skip reason: subject contains skip directive

Change-Id: I1da1b0000f6e2b11f9f43f3a94bc44a14fb144f4

4 years agoDO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
Xin Li [Wed, 30 Oct 2019 22:57:17 +0000 (15:57 -0700)]
DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
am: 9ea19c6179

Change-Id: Id06a1fd7e6c42f9b34bb98dff16a853f4228a4f9

4 years agoDO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master
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

4 years agoMerge "Revert "Check ro.treble.enabled for legacy devices"" am: a9dc08c8cd am: ce504b597e
Daichi Hirono [Wed, 30 Oct 2019 07:14:54 +0000 (00:14 -0700)]
Merge "Revert "Check ro.treble.enabled for legacy devices"" am: a9dc08c8cd am: ce504b597e
am: 0adea49cae

Change-Id: I2caf7920daa0edeffe253fe85e3d938eacba0462

4 years agoMerge "Revert "Check ro.treble.enabled for legacy devices"" am: a9dc08c8cd
Daichi Hirono [Wed, 30 Oct 2019 07:07:53 +0000 (00:07 -0700)]
Merge "Revert "Check ro.treble.enabled for legacy devices"" am: a9dc08c8cd
am: ce504b597e

Change-Id: I581e57ea4a3fa123ddf4984777d0523f21f4e3ae

4 years agoMerge "Revert "Check ro.treble.enabled for legacy devices""
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

4 years agoMerge "Revert "Check ro.treble.enabled for legacy devices""
Treehugger Robot [Wed, 30 Oct 2019 06:53:37 +0000 (06:53 +0000)]
Merge "Revert "Check ro.treble.enabled for legacy devices""

4 years agoRevert "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

4 years agoMerge "Revert "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk...
Jooyung Han [Wed, 30 Oct 2019 04:50:46 +0000 (21:50 -0700)]
Merge "Revert "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk""""" am: 097dd3b20c am: 3e04079e12
am: 056eed24ef

Change-Id: I3e56f5b235b4fdbe8fb025d8121a51135ee6d1f0

4 years agoMerge "Revert "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk...
Jooyung Han [Wed, 30 Oct 2019 04:44:18 +0000 (21:44 -0700)]
Merge "Revert "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk""""" am: 097dd3b20c
am: 3e04079e12

Change-Id: I5346f9cc53a8ac7823ef4cb214685ad7a4adaf12

4 years agoMerge "Revert "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk...
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

4 years agoMerge "Revert "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk...
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"""""

4 years agoMerge "Check ro.treble.enabled for legacy devices" am: 990dfcffdc am: f7a0db4aa2
Daichi Hirono [Wed, 30 Oct 2019 00:07:56 +0000 (17:07 -0700)]
Merge "Check ro.treble.enabled for legacy devices" am: 990dfcffdc am: f7a0db4aa2
am: 65c91df324

Change-Id: Ibbebf90f52f859ef732c9052ae6fe806ccc28b0b

4 years agoMerge "Check ro.treble.enabled for legacy devices" am: 990dfcffdc
Daichi Hirono [Tue, 29 Oct 2019 23:59:49 +0000 (16:59 -0700)]
Merge "Check ro.treble.enabled for legacy devices" am: 990dfcffdc
am: f7a0db4aa2

Change-Id: Ie7a3f15d38d6168ce7935aa7ea03107484372fd2

4 years agoMerge "Check ro.treble.enabled for legacy devices"
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

4 years agoMerge "Check ro.treble.enabled for legacy devices"
Treehugger Robot [Tue, 29 Oct 2019 23:42:23 +0000 (23:42 +0000)]
Merge "Check ro.treble.enabled for legacy devices"

4 years agoCheck 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

4 years agoRevert "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk""""
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

4 years agoMerge "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk"""" am:...
Greg Kaiser [Mon, 28 Oct 2019 17:38:02 +0000 (10:38 -0700)]
Merge "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk"""" am: 54de6a01ed am: 5c82028245 am: 967fa06f3a
am: eea505744e

Change-Id: Icb3678af7d1a0fe6a8ddc0fcccdcad6016675bc6

4 years agoMerge "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk"""" am:...
Greg Kaiser [Mon, 28 Oct 2019 17:32:12 +0000 (10:32 -0700)]
Merge "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk"""" am: 54de6a01ed am: 5c82028245
am: 967fa06f3a

Change-Id: Iccca3f2b035d5f9317ce246629da4d711a70aa56

4 years agoMerge "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk"""" am:...
Greg Kaiser [Mon, 28 Oct 2019 17:26:10 +0000 (10:26 -0700)]
Merge "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk"""" am: 54de6a01ed
am: 5c82028245

Change-Id: Id169034698eb26f03c4fd8b15da1b076b9c6a05f

4 years agoMerge "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk""""
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

4 years agoMerge "Revert "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk""""
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""""

4 years agoRevert "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

4 years agoMerge "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk""" am: 4125e37c3b...
Jooyung Han [Fri, 25 Oct 2019 09:03:17 +0000 (02:03 -0700)]
Merge "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk""" am: 4125e37c3b am: 5f534a9feb am: f383bad166
am: fac674a054

Change-Id: Ie45b5729ab3de8982675a0244c70483f3da57bcc

4 years agoMerge "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk""" am: 4125e37c3b...
Jooyung Han [Fri, 25 Oct 2019 08:50:21 +0000 (01:50 -0700)]
Merge "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk""" am: 4125e37c3b am: 5f534a9feb
am: f383bad166

Change-Id: I1137f020395f6944d6505fa6056601a91e28a0e2

4 years agoMerge "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk""" am: 4125e37c3b
Jooyung Han [Fri, 25 Oct 2019 08:43:40 +0000 (01:43 -0700)]
Merge "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk""" am: 4125e37c3b
am: 5f534a9feb

Change-Id: I01c05d5cf034988afa7fed8b875649232fa9fba7

4 years agoMerge "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk"""
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

4 years agoMerge "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk"""
Jooyung Han [Fri, 25 Oct 2019 08:21:13 +0000 (08:21 +0000)]
Merge "Revert "Revert "Use VNDK APEX instead of /system/lib/vndk"""

4 years agoRevert "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

4 years agoMerge "Revert "Use VNDK APEX instead of /system/lib/vndk"" am: 1324ac1552 am: 851427f...
Jooyung Han [Thu, 17 Oct 2019 12:37:34 +0000 (05:37 -0700)]
Merge "Revert "Use VNDK APEX instead of /system/lib/vndk"" am: 1324ac1552 am: 851427fb9d am: 6070a8863d
am: 5407c740bf

Change-Id: I0ff4ce603816b98282b669f749b30677fe84da9e

4 years agoMerge "Revert "Use VNDK APEX instead of /system/lib/vndk"" am: 1324ac1552 am: 851427fb9d
Jooyung Han [Thu, 17 Oct 2019 12:26:35 +0000 (05:26 -0700)]
Merge "Revert "Use VNDK APEX instead of /system/lib/vndk"" am: 1324ac1552 am: 851427fb9d
am: 6070a8863d

Change-Id: I437537404e25a7a817fc5913ebf22b59e445c28c

4 years agoMerge "Revert "Use VNDK APEX instead of /system/lib/vndk"" am: 1324ac1552
Jooyung Han [Thu, 17 Oct 2019 12:19:33 +0000 (05:19 -0700)]
Merge "Revert "Use VNDK APEX instead of /system/lib/vndk"" am: 1324ac1552
am: 851427fb9d

Change-Id: I14071c6ae18b3d869ca990c94db4747d9e1f1bd9