OSDN Git Service

android-x86/system-linkerconfig.git
4 years agoAdd libandroidicu.so link for VNDK-Lite vendor am: 9811370003 am: 45a24e9f98
Kiyoung Kim [Thu, 9 Apr 2020 04:26:40 +0000 (04:26 +0000)]
Add libandroidicu.so link for VNDK-Lite vendor am: 9811370003 am: 45a24e9f98

Change-Id: Ic2d2cbf5c60a132acc291d8ae2c73009122b9b1d

4 years agoAdd libandroidicu.so link for VNDK-Lite vendor am: 9811370003
Kiyoung Kim [Thu, 9 Apr 2020 04:16:56 +0000 (04:16 +0000)]
Add libandroidicu.so link for VNDK-Lite vendor am: 9811370003

Change-Id: Icd7a7e5301745be6291be36298dcff6e3a27cc2b

4 years agoAdd libandroidicu.so link for VNDK-Lite vendor
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
Change-Id: I255cb0a74cd996b1ce9c30c488edac063ab72ea8

4 years agoAllow SPHAL namespace to access system in case of legacy am: 91a9e2544e am: 97486985ed
Kiyoung Kim [Fri, 3 Apr 2020 01:17:05 +0000 (01:17 +0000)]
Allow SPHAL namespace to access system in case of legacy am: 91a9e2544e am: 97486985ed

Change-Id: Ia63379334cec58b5a3431b537302bf0905e2beb9

4 years agoAllow SPHAL namespace to access system in case of legacy am: 91a9e2544e
Kiyoung Kim [Fri, 3 Apr 2020 00:57:45 +0000 (00:57 +0000)]
Allow SPHAL namespace to access system in case of legacy am: 91a9e2544e

Change-Id: I34e7dcf66d82e4785119fd1ddaa26cbd8195168c

4 years agoAllow SPHAL namespace to access system in case of legacy
Kiyoung Kim [Wed, 1 Apr 2020 08:03:30 +0000 (17:03 +0900)]
Allow SPHAL namespace to access system in case of legacy

In current there is limited link from sphal to platform in case of
legacy device due to absence of VNDK related library list. Anyway, SPHAL
namespace requires access to libraries under /system/lib which is
VNDK-SP in treblelized device. This change adds extra access to system
libs from SPHAL namespace in case of legacy device.

Bug: 152932503
Test: m -j passed
Change-Id: I93fc82a36cf3c2ee33c9bd1f2bb8371bb2d6d700
Merged-In: I93fc82a36cf3c2ee33c9bd1f2bb8371bb2d6d700

4 years agoMove libz from VNDKSP to LLNDK in case of VNDK Lite am: b38d2f5ff3 am: a2c1589b8b
Kiyoung Kim [Wed, 1 Apr 2020 01:28:02 +0000 (01:28 +0000)]
Move libz from VNDKSP to LLNDK in case of VNDK Lite am: b38d2f5ff3 am: a2c1589b8b

Change-Id: Iba5c85fbe1a210706c46c5f7b5a1056953d26142

4 years agoMove libz from VNDKSP to LLNDK in case of VNDK Lite am: b38d2f5ff3
Kiyoung Kim [Wed, 1 Apr 2020 01:15:13 +0000 (01:15 +0000)]
Move libz from VNDKSP to LLNDK in case of VNDK Lite am: b38d2f5ff3

Change-Id: I41447d9cd032afe9db263d2251a849e77cfafe54

4 years agoMove libz from VNDKSP to LLNDK in case of VNDK Lite
Kiyoung Kim [Tue, 31 Mar 2020 05:47:32 +0000 (14:47 +0900)]
Move libz from VNDKSP to LLNDK in case of VNDK Lite

In case of VNDK Lite libz should be listed in LLNDK rather than VNDKSP.
This process has been missed while we move the logic to linkerconfig.
This change updates library list based on the library file name in case
of VNDK lite device.

Bug: 141908078
Test: m -j passed
Change-Id: I22eb76619c1242ab26c1d611a08b98177b08285c

4 years agoAdd extra test mapping with GTS test am: 27776d2b03 am: 9aee519b30
Kiyoung Kim [Tue, 24 Mar 2020 05:06:18 +0000 (05:06 +0000)]
Add extra test mapping with GTS test am: 27776d2b03 am: 9aee519b30

Change-Id: Idd9f1d82ccfb855709d80c8df5d965e19192f69a

4 years agoAdd extra test mapping with GTS test am: 27776d2b03
Kiyoung Kim [Tue, 24 Mar 2020 04:48:16 +0000 (04:48 +0000)]
Add extra test mapping with GTS test am: 27776d2b03

Change-Id: I7acaf2109042714f6d34fa1752d7c758c9a448e5

4 years agoAdd extra test mapping with GTS test
Kiyoung Kim [Tue, 17 Mar 2020 07:53:42 +0000 (16:53 +0900)]
Add extra test mapping with GTS test

Add extra test mapping with new GTS test for linkerconfig.

Bug: 147726605
Test: Tested from gts-tradefed with cuttlefish
Test: atest passed
Change-Id: I800096340f6f814d2e2e78593ad80bef6315a4f6

4 years agoMake libseliux a stub library am: fd3929db02 am: f512a88b15
Automerger Merge Worker [Fri, 13 Mar 2020 05:57:10 +0000 (05:57 +0000)]
Make libseliux a stub library am: fd3929db02 am: f512a88b15

Change-Id: Ia2d9195d8e7797f2cbc59ec027efa60dbc57c458

4 years agoMake libseliux a stub library am: fd3929db02
Automerger Merge Worker [Fri, 13 Mar 2020 05:39:21 +0000 (05:39 +0000)]
Make libseliux a stub library am: fd3929db02

Change-Id: I76337f62d40fface8d7422d6d4aeb58120f34740

4 years agoMake libseliux a stub library
Jiyong Park [Wed, 11 Mar 2020 04:59:38 +0000 (13:59 +0900)]
Make libseliux a stub library

libselinux is currently being copied to APEXes. This is risky because
the library is not designed to be portable; part of it is tied to the
specific version of the Android that it was developed for.

This change fixes the problem by declaring that the library supports
a stub with the list of C APIs that are included in the stub. Then there
is only one copy of libselinux in /system/lib and other APEXes use the
copy by dynamically linking to it.

Bug: 151053366
Test: m com.android.adbd. It doesn't include libselinux in it.
Test: m com.android.adbd-deps-info. then inspect
out/soong/com.android.adbd-deps-info.txt. The dependency to libselinux
is shown as '(external)'.

Merged-In: I445db2d0c5103b8b3267caa094f5d91259f1f491
(cherry picked from commit 74d75a773d200542ac3439fc166aa87ef40e0104)
Change-Id: I445db2d0c5103b8b3267caa094f5d91259f1f491

4 years agoMake sphal and vndk namespace available from legacy devices am: c016d99023 am: b47b871b12
Automerger Merge Worker [Thu, 27 Feb 2020 18:01:54 +0000 (18:01 +0000)]
Make sphal and vndk namespace available from legacy devices am: c016d99023 am: b47b871b12

Change-Id: I668b07c1e986496dfc4591a1c31128ffda20015b

4 years agoMake sphal and vndk namespace available from legacy devices am: c016d99023
Automerger Merge Worker [Thu, 27 Feb 2020 17:43:11 +0000 (17:43 +0000)]
Make sphal and vndk namespace available from legacy devices am: c016d99023

Change-Id: I876b27b10320f77097fbf4b6402de2889a5da01d

4 years agoMake sphal and vndk namespace available from legacy devices
Kiyoung Kim [Wed, 26 Feb 2020 04:36:48 +0000 (13:36 +0900)]
Make sphal and vndk namespace available from legacy devices

linkerconfig failed to complete the execution from ARC++ which was
caused by missing vndk variables because ARC++ is legacy device. This
change allows linkerconfig to generate ld.config.txt for SWCodec by
allowing SPHal and VNDK namespaces even from legacy devices

Bug: 149914078
Test: m -j passed
Test: Tested from ARC++ w/ betty
Change-Id: I5412434f0d2b3b69b916ca512828498a7eba72a3

4 years agoAdd libadbd_fs to list of stub dependencies. am: 3a9d1a7fbd am: 5f53f24715
Automerger Merge Worker [Tue, 25 Feb 2020 12:15:22 +0000 (12:15 +0000)]
Add libadbd_fs to list of stub dependencies. am: 3a9d1a7fbd am: 5f53f24715

Change-Id: I5daae42c9e57950976fa42b73962724ec7d48358

4 years agoAdd libadbd_fs to list of stub dependencies. am: 3a9d1a7fbd
Automerger Merge Worker [Tue, 25 Feb 2020 12:01:12 +0000 (12:01 +0000)]
Add libadbd_fs to list of stub dependencies. am: 3a9d1a7fbd

Change-Id: I13e3c84ebf0b08adb79dcf42ff4e2dc828a1dc53

4 years agoAdd libadbd_fs to list of stub dependencies.
Josh Gao [Fri, 21 Feb 2020 04:43:55 +0000 (20:43 -0800)]
Add libadbd_fs to list of stub dependencies.

Bug: http://b/150032044
Test: treehugger
Change-Id: Iebb108c212ace8470efef6c2838eaefdd4b4be70
(cherry picked from commit c96d815c0a621355fae3e03949fbecc18b5c27b5)

4 years agoMerge "[adbwifi] Add adbd apex exported libs to system namespace." am: c005be7589...
Automerger Merge Worker [Fri, 21 Feb 2020 21:58:54 +0000 (21:58 +0000)]
Merge "[adbwifi] Add adbd apex exported libs to system namespace." am: c005be7589 am: 6140ec2c59 am: d62ab54b6e

Change-Id: Iff0c1c60a3f70dca0fec7d0dcb2060a22f8c4010

4 years agoMerge "[adbwifi] Add adbd apex exported libs to system namespace." am: c005be7589...
Automerger Merge Worker [Fri, 21 Feb 2020 21:41:40 +0000 (21:41 +0000)]
Merge "[adbwifi] Add adbd apex exported libs to system namespace." am: c005be7589 am: 6140ec2c59

Change-Id: I8d92a3ccd799c77860ce7a4760b51c97fa24f69d

4 years agoMerge "[adbwifi] Add adbd apex exported libs to system namespace." am: c005be7589
Automerger Merge Worker [Fri, 21 Feb 2020 21:23:05 +0000 (21:23 +0000)]
Merge "[adbwifi] Add adbd apex exported libs to system namespace." am: c005be7589

Change-Id: I5440261e02501e6fac27fee126485a22dea9de3a

4 years agoMerge "[adbwifi] Add adbd apex exported libs to system namespace."
Joshua Duong [Fri, 21 Feb 2020 21:07:51 +0000 (21:07 +0000)]
Merge "[adbwifi] Add adbd apex exported libs to system namespace."

4 years agoMerge "Trim root path from output" am: b7c162435b am: 89b12b6f0b am: 9462843907
Automerger Merge Worker [Fri, 21 Feb 2020 11:02:45 +0000 (11:02 +0000)]
Merge "Trim root path from output" am: b7c162435b am: 89b12b6f0b am: 9462843907

Change-Id: Ie9dbcf3ba23259c3f8772923fab4309aebce0a6c

4 years agoMerge "Trim root path from output" am: b7c162435b am: 89b12b6f0b
Automerger Merge Worker [Fri, 21 Feb 2020 10:43:45 +0000 (10:43 +0000)]
Merge "Trim root path from output" am: b7c162435b am: 89b12b6f0b

Change-Id: Ic8b6bf9400f312efd3b4df56ebd36b37c2887d89

4 years agoMerge "Define vndk_product namespace for product apps" am: 6eb18354c1 am: 7df20a75d3...
Automerger Merge Worker [Fri, 21 Feb 2020 10:33:40 +0000 (10:33 +0000)]
Merge "Define vndk_product namespace for product apps" am: 6eb18354c1 am: 7df20a75d3 am: e6bc21ab7e

Change-Id: I799decaf32bd50913ddd7f227e5f5786848b0eb8

4 years agoMerge "Trim root path from output" am: b7c162435b
Automerger Merge Worker [Fri, 21 Feb 2020 10:27:08 +0000 (10:27 +0000)]
Merge "Trim root path from output" am: b7c162435b

Change-Id: If7db732fa5a1e267c777c0610608dc3492a77749

4 years agoMerge "Define vndk_product namespace for product apps" am: 6eb18354c1 am: 7df20a75d3
Automerger Merge Worker [Fri, 21 Feb 2020 10:22:28 +0000 (10:22 +0000)]
Merge "Define vndk_product namespace for product apps" am: 6eb18354c1 am: 7df20a75d3

Change-Id: I98e7a8604acbc0d324d3ed831f92b8b84788b944

4 years agoMerge "Trim root path from output"
Treehugger Robot [Fri, 21 Feb 2020 10:14:36 +0000 (10:14 +0000)]
Merge "Trim root path from output"

4 years agoMerge "Define vndk_product namespace for product apps" am: 6eb18354c1
Automerger Merge Worker [Fri, 21 Feb 2020 10:00:19 +0000 (10:00 +0000)]
Merge "Define vndk_product namespace for product apps" am: 6eb18354c1

Change-Id: Ifde5ffcae2bdad31e068f2fabfbe9a1838b14a21

4 years agoMerge "Define vndk_product namespace for product apps"
Treehugger Robot [Fri, 21 Feb 2020 09:38:26 +0000 (09:38 +0000)]
Merge "Define vndk_product namespace for product apps"

4 years agoMerge "Make /linkerconfig/<apexname> directories accessible to others" am: b52f719faf...
Automerger Merge Worker [Fri, 21 Feb 2020 08:08:19 +0000 (08:08 +0000)]
Merge "Make /linkerconfig/<apexname> directories accessible to others" am: b52f719faf am: bc9db82bf5 am: f7c80a6f22

Change-Id: I6ad824c33f16dd54f6afe08ccc4d4ddf6c18d5e1

4 years agoMerge "Make /linkerconfig/<apexname> directories accessible to others" am: b52f719faf...
Automerger Merge Worker [Fri, 21 Feb 2020 07:51:43 +0000 (07:51 +0000)]
Merge "Make /linkerconfig/<apexname> directories accessible to others" am: b52f719faf am: bc9db82bf5

Change-Id: Id37a319f81c2b66968fd3d818d325aaab7c0956e

4 years agoMerge "Make /linkerconfig/<apexname> directories accessible to others" am: b52f719faf
Automerger Merge Worker [Fri, 21 Feb 2020 07:37:41 +0000 (07:37 +0000)]
Merge "Make /linkerconfig/<apexname> directories accessible to others" am: b52f719faf

Change-Id: Id755473867942a98d93d1091a3e7556fccbd43bd

4 years agoMerge "Make /linkerconfig/<apexname> directories accessible to others"
Treehugger Robot [Fri, 21 Feb 2020 07:14:12 +0000 (07:14 +0000)]
Merge "Make /linkerconfig/<apexname> directories accessible to others"

4 years agoTrim root path from output
Jooyung Han [Thu, 20 Feb 2020 09:21:03 +0000 (18:21 +0900)]
Trim root path from output

When linkerconfig runs on host with --root argument, it prints root as
well like following:

$ linkerconfig --vndk R --root /tmp/test_root
...
namespace.foo.search_paths = /tmp/test_root/product/${LIB}
..

This change trims root from path variables and apex paths so the output
look more like real output.

Bug: n/a
Test: build/boot
      run linkerconfig on host and compare outputs

Change-Id: Icc91f297047f059684a42d825048e50e26873520

4 years agoMake /linkerconfig/<apexname> directories accessible to others
Jiyong Park [Fri, 21 Feb 2020 04:56:52 +0000 (13:56 +0900)]
Make /linkerconfig/<apexname> directories accessible to others

When linkerconfig is exec'ed by init, umask is by default set to 0x0077.
As a result, even though we create the directories with mkdir(...,
0755), they are marked as inaccessible for group and others.

Fixing the issue by explicitly setting umask to 0x0022.

Bug: 144914078
Test: build a device with flattened APEX. Check the mode bits of the
directories of under /linkerconfig.

$ ls -al /linkerconfig
total 96
drwxr-xr-x  9 root root   200 2020-02-21 13:47 .
drwxr-xr-x 22 root root  4096 2020-02-21 13:54 ..
drwx--xr-x  2 root root    60 2020-02-21 13:47 com.android.adbd
drwx--xr-x  2 root root    60 2020-02-21 13:47 com.android.art
drwx--xr-x  2 root root    60 2020-02-21 13:47 com.android.conscrypt
drwx--xr-x  2 root root    60 2020-02-21 13:47 com.android.media.swcodec
drwx--xr-x  2 root root    60 2020-02-21 13:47 com.android.os.statsd
drwx--xr-x  2 root root    60 2020-02-21 13:47 com.android.runtime
drwx--xr-x  2 root root    60 2020-02-21 13:47 com.android.sdkext
-rw-r--r--  1 root root 91651 2020-02-21 13:47 ld.config.txt

Change-Id: Id2f7f8a363ba239943942ba6e3bc984cd8f630b0

4 years ago[adbwifi] Add adbd apex exported libs to system namespace.
Joshua Duong [Mon, 10 Feb 2020 06:28:01 +0000 (22:28 -0800)]
[adbwifi] Add adbd apex exported libs to system namespace.

These libraries will be used by system_server
(libandroid_servers.so).

Bug: b/149181583
Bug: b/111434128

Test: boots, adbd is not crashing.
Test: cat /proc/`pidof system_server`/maps | grep libadb
Verify that only libadb_pairing_auth.so, libadb_pairing_connection.so,
and libadb_pairing_server.so are being used.
Test: cat /proc/`pidof adbd`/maps | grep libadb
Change-Id: I8b645c9aca2465d5231b3cb21ca85fc3ebfc9093

4 years agoDefine vndk_product namespace for product apps
Justin Yun [Tue, 18 Feb 2020 06:01:51 +0000 (15:01 +0900)]
Define vndk_product namespace for product apps

Unbundled apps may use vndk-sp libs from the system section. However,
product apps must use the vndk-sp libs for the product vndk version
that can be different from the vendor vndk version. So we must define
a vndk namespace for product partition.

For this purpose, BuildVndkNamespace() function requires an
additional parameter to indicate which partition is using the
namespace.
Using this function, the system section has an additional namespace
called "vndk_product" which is used only for unbundled product apps.

Test: atest linkerconfig_modules_unittest
Bug: 149063221
Change-Id: I3658efdc75e5c9a0ac3b92b9afc68aff2d4cb300

4 years agoMerge "Rename APEX Namespace" am: 52120b489b am: 6e1b2ec7ac am: 23a196f070
Automerger Merge Worker [Fri, 21 Feb 2020 01:35:42 +0000 (01:35 +0000)]
Merge "Rename APEX Namespace" am: 52120b489b am: 6e1b2ec7ac am: 23a196f070

Change-Id: I2742005272e4f358582374feea00cfc7114d1b08

4 years agoMerge "Rename APEX Namespace" am: 52120b489b am: 6e1b2ec7ac
Automerger Merge Worker [Fri, 21 Feb 2020 01:22:19 +0000 (01:22 +0000)]
Merge "Rename APEX Namespace" am: 52120b489b am: 6e1b2ec7ac

Change-Id: Ie27efc805d25e509576981f7ae03cc70cb555153

4 years agoMerge "Rename APEX Namespace" am: 52120b489b
Automerger Merge Worker [Fri, 21 Feb 2020 01:12:02 +0000 (01:12 +0000)]
Merge "Rename APEX Namespace" am: 52120b489b

Change-Id: I1ad4220320ce62274f553afa7e81b322e82e1f51

4 years agoMerge "Rename APEX Namespace"
Kiyoung Kim [Fri, 21 Feb 2020 01:04:37 +0000 (01:04 +0000)]
Merge "Rename APEX Namespace"

4 years agoMerge "Fix full content test" am: 9fa8d06ecc am: 9873f73464 am: 93b00ebe5d
Automerger Merge Worker [Fri, 21 Feb 2020 00:27:38 +0000 (00:27 +0000)]
Merge "Fix full content test" am: 9fa8d06ecc am: 9873f73464 am: 93b00ebe5d

Change-Id: If096476b1579fbab5015b11ec88d2836654f8321

4 years agoMerge "Fix full content test" am: 9fa8d06ecc am: 9873f73464
Automerger Merge Worker [Fri, 21 Feb 2020 00:16:45 +0000 (00:16 +0000)]
Merge "Fix full content test" am: 9fa8d06ecc am: 9873f73464

Change-Id: I12c6f0f14516ab2e0306d3bdf7a4779ecbd78a54

4 years agoMerge "Fix full content test" am: 9fa8d06ecc
Automerger Merge Worker [Fri, 21 Feb 2020 00:07:01 +0000 (00:07 +0000)]
Merge "Fix full content test" am: 9fa8d06ecc

Change-Id: I41c27ed81cfb803954d773a07a4d0747bea4b33f

4 years agoMerge "Fix full content test"
Kiyoung Kim [Thu, 20 Feb 2020 23:46:39 +0000 (23:46 +0000)]
Merge "Fix full content test"

4 years agoFix full content test
Kiyoung Kim [Thu, 20 Feb 2020 09:04:23 +0000 (18:04 +0900)]
Fix full content test

Full content test was not working properly because the way of checking
if VNDK is enabled has been changed. This fix generates test context to
mock it available for VNDK.

Test: atest passed
Change-Id: I46064d1d5505dc5c6af438e69faae166dee9dc58

4 years agoMerge "Remove libstatssocket from variableloader."
TreeHugger Robot [Thu, 20 Feb 2020 02:35:47 +0000 (02:35 +0000)]
Merge "Remove libstatssocket from variableloader."

4 years agoRename APEX Namespace
Kiyoung Kim [Wed, 19 Feb 2020 07:26:03 +0000 (16:26 +0900)]
Rename APEX Namespace

Current APEX Namespace is named with APEX name itself, which also uses
.(dot) so linker configuration can keep the syntax safe. Update name of
namespace from APEX by replacing '_' with '.' so keep configuration safe
for future syntax update.

Bug: 148826508
Test: m -j passed
Test: boot succeeded from cuttlefish and walleye
Change-Id: I9185c909678e2e39d539622d51d8f378b819b466

4 years agoAdd com.android.os.statsd to legacy linkerconfig am: 2b465ce881 am: 6f3a53b4ec am...
Automerger Merge Worker [Wed, 19 Feb 2020 04:40:06 +0000 (04:40 +0000)]
Add com.android.os.statsd to legacy linkerconfig am: 2b465ce881 am: 6f3a53b4ec am: c7021d5078

Change-Id: If563eb141acbc55dff88de4a4ce1a63ca53c404b

4 years agoAdd com.android.os.statsd to legacy linkerconfig am: 2b465ce881 am: 6f3a53b4ec
Automerger Merge Worker [Wed, 19 Feb 2020 04:20:25 +0000 (04:20 +0000)]
Add com.android.os.statsd to legacy linkerconfig am: 2b465ce881 am: 6f3a53b4ec

Change-Id: Id4711bdabc9a4eb5f123a83d53afb029fc948b4b

4 years agoAdd com.android.os.statsd to legacy linkerconfig am: 2b465ce881
Automerger Merge Worker [Wed, 19 Feb 2020 04:06:42 +0000 (04:06 +0000)]
Add com.android.os.statsd to legacy linkerconfig am: 2b465ce881

Change-Id: Ib2a29f358385d1b67a27f58e900dcd76a2efa20f

4 years agoAdd com.android.os.statsd to legacy linkerconfig
Garfield Tan [Wed, 19 Feb 2020 01:43:36 +0000 (17:43 -0800)]
Add com.android.os.statsd to legacy linkerconfig

Similar to aosp/1237667, but for legacy stuff.

Bug: None
Test: Legacy stuff boots.
Change-Id: Iad17f5529ea6bb520c0ee5a4071a82ffd7c2cc27

4 years agoRemove libstatssocket from variableloader.
Ruchir Rastogi [Tue, 18 Feb 2020 20:16:56 +0000 (12:16 -0800)]
Remove libstatssocket from variableloader.

Need this so libstatssocket can be added to statsd apex

Bug: 145923416
Test: m
Change-Id: I5630321d26e208b540c408f82d3f9759dd1a9c14

4 years agoMerge "Update linkerconfig for libs in statsd" am: 5504faa670 am: 1730a33997 am:...
Automerger Merge Worker [Tue, 18 Feb 2020 21:24:35 +0000 (21:24 +0000)]
Merge "Update linkerconfig for libs in statsd" am: 5504faa670 am: 1730a33997 am: 2cf963981a

Change-Id: Ibbb4d877ec8f46e3d0856c192c9f58d5a81dcabc

4 years agoMerge "Update linkerconfig for libs in statsd" am: 5504faa670 am: 1730a33997
Automerger Merge Worker [Tue, 18 Feb 2020 21:09:46 +0000 (21:09 +0000)]
Merge "Update linkerconfig for libs in statsd" am: 5504faa670 am: 1730a33997

Change-Id: I01042fe7ee802e5c224ff00c001219b87f32e419

4 years agoMerge "Update linkerconfig for libs in statsd" am: 5504faa670
Jeffrey Huang [Tue, 18 Feb 2020 20:50:43 +0000 (20:50 +0000)]
Merge "Update linkerconfig for libs in statsd" am: 5504faa670

Change-Id: I969a8e8828d5e9273c863688c48d6d2ba9297d95

4 years agoMerge "Update linkerconfig for libs in statsd"
Jeffrey Huang [Tue, 18 Feb 2020 18:26:53 +0000 (18:26 +0000)]
Merge "Update linkerconfig for libs in statsd"

4 years ago[automerger skipped] Merge "Add com.android.os.statsd to linkerconfig" am: 91fccce607...
Treehugger Robot [Tue, 18 Feb 2020 08:41:52 +0000 (08:41 +0000)]
[automerger skipped] Merge "Add com.android.os.statsd to linkerconfig" am: 91fccce607 am: 365c145906 am: 0527fe2a0b -s ours
am skip reason: Change-Id Id516e79e12fde608888587ec15ab0f3358f4918d with SHA-1 91454166a5 is in history

Change-Id: Idbf18b03909699084b41ddce9e8aea5702ed1c15

4 years agoMerge "Add com.android.os.statsd to linkerconfig" am: 91fccce607 am: 365c145906
Treehugger Robot [Tue, 18 Feb 2020 08:27:29 +0000 (08:27 +0000)]
Merge "Add com.android.os.statsd to linkerconfig" am: 91fccce607 am: 365c145906

Change-Id: I245cf83033159721babcc7c176d3290e68d51aef

4 years agoMerge "Add com.android.os.statsd to linkerconfig" am: 91fccce607
Treehugger Robot [Tue, 18 Feb 2020 08:06:49 +0000 (08:06 +0000)]
Merge "Add com.android.os.statsd to linkerconfig" am: 91fccce607

Change-Id: Ia2aa4670b96557434b1c1c8675409e17515f00a3

4 years agoMerge "Add com.android.os.statsd to linkerconfig"
Treehugger Robot [Tue, 18 Feb 2020 07:54:26 +0000 (07:54 +0000)]
Merge "Add com.android.os.statsd to linkerconfig"

4 years agoAdd com.android.os.statsd to linkerconfig
Tej Singh [Thu, 13 Feb 2020 01:21:01 +0000 (17:21 -0800)]
Add com.android.os.statsd to linkerconfig

Adds com.android.os.statsd to System BuildSection. I believe this is to
get the namespace the proper visibility for jni.

Test: build/boots
Change-Id: Id516e79e12fde608888587ec15ab0f3358f4918d
Merged-In: Id516e79e12fde608888587ec15ab0f3358f4918d
(cherry picked from commit 91454166a50d86d2367c8ec5b4686087ecc13184)

4 years agoMerge "Remove extra using statements" am: 28133def11 am: de106d8a2d am: f06d838b57
Treehugger Robot [Tue, 18 Feb 2020 06:04:01 +0000 (06:04 +0000)]
Merge "Remove extra using statements" am: 28133def11 am: de106d8a2d am: f06d838b57

Change-Id: I252010db64b9f8e771b30b362044189414b297a3

4 years agoMerge "Remove extra using statements" am: 28133def11 am: de106d8a2d
Treehugger Robot [Tue, 18 Feb 2020 05:45:53 +0000 (05:45 +0000)]
Merge "Remove extra using statements" am: 28133def11 am: de106d8a2d

Change-Id: Ida676cfd0249a0134df4f8afa79e7e9bfd42721e

4 years agoMerge "Remove extra using statements" am: 28133def11
Treehugger Robot [Tue, 18 Feb 2020 05:30:16 +0000 (05:30 +0000)]
Merge "Remove extra using statements" am: 28133def11

Change-Id: Iab0964273993949a3eb3c0c331eb58bc75e3c5e1

4 years agoMerge "Remove extra using statements"
Treehugger Robot [Tue, 18 Feb 2020 05:20:14 +0000 (05:20 +0000)]
Merge "Remove extra using statements"

4 years agoUpdate linkerconfig for libs in statsd
Jeffrey Huang [Mon, 17 Feb 2020 19:59:58 +0000 (11:59 -0800)]
Update linkerconfig for libs in statsd

Bug: 148605160
Test: m -j
Change-Id: Idb6308e8f518536e97106c445b1945945040a4c3

4 years agoMerge "Add com.android.os.statsd to linkerconfig"
Howard Ro [Mon, 17 Feb 2020 09:00:54 +0000 (09:00 +0000)]
Merge "Add com.android.os.statsd to linkerconfig"

4 years agoMerge changes from topic "revert-149538115"
TreeHugger Robot [Fri, 14 Feb 2020 23:50:37 +0000 (23:50 +0000)]
Merge changes from topic "revert-149538115"

* changes:
  Revert "Update linkerConfig for libstatspull"
  Revert "Add libstatssocket to linkerconfig"

4 years agoRevert "Update linkerConfig for libstatspull"
Wonsik Kim [Fri, 14 Feb 2020 19:15:54 +0000 (11:15 -0800)]
Revert "Update linkerConfig for libstatspull"

This reverts commit 9548694cad549d02d2f6e53398d0674255a71646.

Reason for revert: major functional regression
Exempt-From-Owner-Approval: revert
Bug: 149538115
Change-Id: I2510f2ae628832b5b856bc9319749e5d8bb2396a

4 years agoRevert "Add libstatssocket to linkerconfig"
Wonsik Kim [Fri, 14 Feb 2020 19:15:45 +0000 (11:15 -0800)]
Revert "Add libstatssocket to linkerconfig"

This reverts commit 56ce2c746dfb2a75e7a544296caf84efd1308847.

Reason for revert: major functional regression
Exempt-From-Owner-Approval: revert
Bug: 149538115
Change-Id: Ie947834b213f5b3cd771c634c362f61a4dcf4bf2

4 years agoMerge "Fix Camera bug" am: 5c811ebf1c am: 4291671637 am: e905991783
Jeffrey Huang [Fri, 14 Feb 2020 22:57:43 +0000 (22:57 +0000)]
Merge "Fix Camera bug" am: 5c811ebf1c am: 4291671637 am: e905991783

Change-Id: I757438f9c0f7cbc1e252d86448e8bcfb35fb4318

4 years agoMerge "Fix Camera bug" am: 5c811ebf1c am: 4291671637
Jeffrey Huang [Fri, 14 Feb 2020 22:33:24 +0000 (22:33 +0000)]
Merge "Fix Camera bug" am: 5c811ebf1c am: 4291671637

Change-Id: I7a4bd4b68772d59e1085799bdadfe8ddfd1562f8

4 years agoMerge "Fix Camera bug" am: 5c811ebf1c
Jeffrey Huang [Fri, 14 Feb 2020 22:11:39 +0000 (22:11 +0000)]
Merge "Fix Camera bug" am: 5c811ebf1c

Change-Id: I78f49c50833251698c1fc5351e3a5ee66819e872

4 years agoMerge "Fix Camera bug"
Jeffrey Huang [Fri, 14 Feb 2020 21:57:31 +0000 (21:57 +0000)]
Merge "Fix Camera bug"

4 years agoRemove extra using statements
Tom Cherry [Fri, 14 Feb 2020 20:27:19 +0000 (12:27 -0800)]
Remove extra using statements

android::base::Errorf and android::base::ErrnoErrorf are now #define's
instead of functions, so remove their using statements.

Test: build
Change-Id: I7333b916ee87668fb9fd15b9293de5da41c43409

4 years agoFix Camera bug
Jeffrey Huang [Fri, 14 Feb 2020 20:08:20 +0000 (12:08 -0800)]
Fix Camera bug

Bug: 149538115
Test: Flash and take a picture, verified no crash
Change-Id: Idd455f8803cf6f1b1f4c95d854a6077e33bae5e1

4 years agoAllow libincident.so to be linked from apex am: 4e15bf53f0 am: b741643a5c am: adbf2d62cd
Jeffrey Huang [Fri, 14 Feb 2020 04:31:26 +0000 (04:31 +0000)]
Allow libincident.so to be linked from apex am: 4e15bf53f0 am: b741643a5c am: adbf2d62cd

Change-Id: Ica4fa575d8cc92707e70a4b4a241ae05985a82d2

4 years agoAllow libincident.so to be linked from apex am: 4e15bf53f0 am: b741643a5c
Jeffrey Huang [Fri, 14 Feb 2020 04:18:14 +0000 (04:18 +0000)]
Allow libincident.so to be linked from apex am: 4e15bf53f0 am: b741643a5c

Change-Id: I965b1fba687d5b8a82a11a5ce6f52ec9eea185e1

4 years agoAllow libincident.so to be linked from apex am: 4e15bf53f0
Jeffrey Huang [Fri, 14 Feb 2020 04:07:02 +0000 (04:07 +0000)]
Allow libincident.so to be linked from apex am: 4e15bf53f0

Change-Id: Iea0a310c93367544a21a0964a7985647f888ef52

4 years agoAllow libincident.so to be linked from apex
Jeffrey Huang [Thu, 13 Feb 2020 23:40:36 +0000 (15:40 -0800)]
Allow libincident.so to be linked from apex

Bug: 145923087
Test: m -j
Change-Id: I787f15750e19c5028b334161c5a7d4fa13003c6f

4 years agoAdd libstatssocket to linkerconfig
Muhammad Qureshi [Wed, 12 Feb 2020 15:49:48 +0000 (07:49 -0800)]
Add libstatssocket to linkerconfig

Bug: 145923416
Test: m
Test: fastboot flashall
Change-Id: If3936e1a22fb7b0c055fb8fbf121c423e30b068e

4 years agoMerge "Update linkerConfig for libstatspull"
Jeffrey Huang [Thu, 13 Feb 2020 19:10:41 +0000 (19:10 +0000)]
Merge "Update linkerConfig for libstatspull"

4 years agoFix linkerconfig_backward_compatibility_test am: 2dd4e4d2cb am: b94abc04ad am: 20effc1bdc
Automerger Merge Worker [Thu, 13 Feb 2020 07:08:47 +0000 (07:08 +0000)]
Fix linkerconfig_backward_compatibility_test am: 2dd4e4d2cb am: b94abc04ad am: 20effc1bdc

Change-Id: Ifa2b1a23ad20a5b6cc55f83eb1dd1420e380f42c

4 years agoFix linkerconfig_backward_compatibility_test am: 2dd4e4d2cb am: b94abc04ad
Automerger Merge Worker [Thu, 13 Feb 2020 06:54:14 +0000 (06:54 +0000)]
Fix linkerconfig_backward_compatibility_test am: 2dd4e4d2cb am: b94abc04ad

Change-Id: Ifa52778d8d084fd1b0828a6c0f1e04479eb0cf1f

4 years agoFix linkerconfig_backward_compatibility_test am: 2dd4e4d2cb
Automerger Merge Worker [Thu, 13 Feb 2020 06:42:09 +0000 (06:42 +0000)]
Fix linkerconfig_backward_compatibility_test am: 2dd4e4d2cb

Change-Id: I978ed22941f49942163419544398f8925af3ddaa

4 years agoAdd com.android.os.statsd to linkerconfig
Tej Singh [Thu, 13 Feb 2020 01:21:01 +0000 (17:21 -0800)]
Add com.android.os.statsd to linkerconfig

Adds com.android.os.statsd to System BuildSection. I believe this is to
get the namespace the proper visibility for jni.

Test: build/boots
Change-Id: Id516e79e12fde608888587ec15ab0f3358f4918d

4 years agoFix linkerconfig_backward_compatibility_test
Jooyung Han [Wed, 12 Feb 2020 23:41:15 +0000 (08:41 +0900)]
Fix linkerconfig_backward_compatibility_test

The current GetValue() falls back to GetProperty(). This makes the test
show different result on different running environment. For consistent
test result, MockVariables() now overrides all product/vendor variables.

Bug: n/a
Test: atest --host linkerconfig_backward_compatibility_test
      atest linkerconfig_backward_compatibility_test

Change-Id: I4b7533e10058b0236a8aef4c54fbb58f3bec0ccc

4 years agoRead vndk libraries txt files from vndk apex am: 7c2b73a71f am: 1b5d7bf6e8 am: a7fe564aeb
Automerger Merge Worker [Wed, 12 Feb 2020 19:08:40 +0000 (19:08 +0000)]
Read vndk libraries txt files from vndk apex am: 7c2b73a71f am: 1b5d7bf6e8 am: a7fe564aeb

Change-Id: I2212ea8e9945a173bd8c0b8979d1a78548ea4cc5

4 years agoGenerate vendor stuff only if vndk is avilable am: 3f83cfb602 am: 3ea9bdb598 am:...
Automerger Merge Worker [Wed, 12 Feb 2020 19:08:39 +0000 (19:08 +0000)]
Generate vendor stuff only if vndk is avilable am: 3f83cfb602 am: 3ea9bdb598 am: 61c2b726de

Change-Id: I3af075af6abab4806a7e1c84d1730847e2731120

4 years agoRead vndk libraries txt files from vndk apex am: 7c2b73a71f am: 1b5d7bf6e8
Automerger Merge Worker [Wed, 12 Feb 2020 18:57:07 +0000 (18:57 +0000)]
Read vndk libraries txt files from vndk apex am: 7c2b73a71f am: 1b5d7bf6e8

Change-Id: Ibe7a89be985750a6362ea047844c6829ef9c0508

4 years agoGenerate vendor stuff only if vndk is avilable am: 3f83cfb602 am: 3ea9bdb598
Automerger Merge Worker [Wed, 12 Feb 2020 18:57:03 +0000 (18:57 +0000)]
Generate vendor stuff only if vndk is avilable am: 3f83cfb602 am: 3ea9bdb598

Change-Id: Ia13c12dff6af00263d8b69c70f3a34ba2ce82315

4 years agoRead vndk libraries txt files from vndk apex am: 7c2b73a71f
Automerger Merge Worker [Wed, 12 Feb 2020 18:42:25 +0000 (18:42 +0000)]
Read vndk libraries txt files from vndk apex am: 7c2b73a71f

Change-Id: I24a5c1482e9a059025dac3aba1ea1e1cf485b7b2

4 years agoGenerate vendor stuff only if vndk is avilable am: 3f83cfb602
Automerger Merge Worker [Wed, 12 Feb 2020 18:42:22 +0000 (18:42 +0000)]
Generate vendor stuff only if vndk is avilable am: 3f83cfb602

Change-Id: I90769d8e5ae9ea3116454aa3bf4d43d04021a877

4 years agoRead vndk libraries txt files from vndk apex
Jooyung Han [Tue, 11 Feb 2020 23:53:51 +0000 (08:53 +0900)]
Read vndk libraries txt files from vndk apex

Vndk apex contains some txt files which list libraries it contains.
- llndk.libraries.txt
- vndksp.libraries.txt
- vndkcore.libraries.txt
- vndkprivate.libraries.txt

These files can be read from vndk apex instead of /system/etc.

Bug: 145184886
Test: build / flash / boot
Change-Id: I2b242b71768af2a30de519ccd4d73b1a86e46382

4 years agoGenerate vendor stuff only if vndk is avilable
Jooyung Han [Tue, 11 Feb 2020 23:43:31 +0000 (08:43 +0900)]
Generate vendor stuff only if vndk is avilable

Linkerconfig runs even when there is no apexes available. When vndk apex
is not available, having vendor section or namespaces requiring vndk
libraries is meaningless.

This is necessary because we'd like to load some variables from vndk
apex, but relying on those variables when vndk apex is not available may
fail to generate linker configuration.

Bug: 145184886
Test: build / flash / boot
Change-Id: I7c77757254a63c8bc7470c4ae87f2db3779e6465