OSDN Git Service

android-x86/system-linkerconfig.git
4 years agoMatch vendor requires with system from VNDK Lite am: b604764645
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

4 years agoUpdate golden_output am: 73c22fcbcd
Kiyoung Kim [Thu, 28 May 2020 10:03:46 +0000 (10:03 +0000)]
Update golden_output am: 73c22fcbcd

Change-Id: Ide86863fb1ec2dd79f75d441a27b37060168e7b1

4 years agoAdd libandroidicu.so link for VNDK-Lite vendor am: 12633592f0
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

4 years agoAdd com.android.os.statsd testdata am: e543413e4d
Jooyung Han [Thu, 28 May 2020 10:03:41 +0000 (10:03 +0000)]
Add com.android.os.statsd testdata am: e543413e4d

Change-Id: Ie272469044bc2cdea5f3fc7d337b822583704f1f

4 years agoMerge "Add system link for libfdtrack.so" am: 464a34be4b
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

4 years agoMerge "Add system link for libfdtrack.so"
Josh Gao [Thu, 28 May 2020 03:20:48 +0000 (03:20 +0000)]
Merge "Add system link for libfdtrack.so"

4 years agoMatch vendor requires with system from VNDK Lite
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)

4 years agoUpdate golden_output
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

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
Merged-In: I255cb0a74cd996b1ce9c30c488edac063ab72ea8
Change-Id: I255cb0a74cd996b1ce9c30c488edac063ab72ea8
(cherry picked from commit 9811370003c4d88ed6a3a396a21ad1306c57add8)

4 years agoAdd com.android.os.statsd testdata
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

4 years agoDo not isolate sphal and vndk from unrestricted am: 2d44cfc444
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

4 years agoDo not isolate sphal and vndk from unrestricted
Kiyoung Kim [Wed, 27 May 2020 03:49:46 +0000 (12:49 +0900)]
Do not isolate sphal and vndk from unrestricted

After introducing sphal and vndk namespaces, some tests fails due to
existance of sphal namespace in unrestricted section. This change
updates sphal and vndk not to be isolated from unrestricted namespaces
so test can dlopen libraries from custom path (such as /data/local) as required.
In addition, include rs namespace in unrestricted section so
Renderscript test can use rs libraries from unrestricted section.

Bug: 156449540
Test: RenderscriptHidlTest passed with aosp_crosshatch-userdebug
Change-Id: Ib1526e225971312f126d75f26d7aa5c523011922
Merged-In: Ib1526e225971312f126d75f26d7aa5c523011922

4 years agoAdd system link for libfdtrack.so
Josh Gao [Fri, 15 May 2020 23:04:23 +0000 (16:04 -0700)]
Add system link for libfdtrack.so

libfdtrack.so is currently a library on the system image that's used via
dlopen to debug file descriptor leaks. We may want to move this into the
runtime module, but for now, add it as a system link.

Bug: http://b/151688751
Bug: http://b/156571476
Test: added dlopen to adbd
Change-Id: I21ebfe04d7ad85149e4df8a40911efd94ce5cf94

4 years agoDo not link stub libraries from all namespaces am: fd8cf9340b
Kiyoung Kim [Tue, 19 May 2020 07:32:38 +0000 (07:32 +0000)]
Do not link stub libraries from all namespaces am: fd8cf9340b

Change-Id: I6061c4a459d206bf6b2161dd0e23a69d64be254d

4 years agoDo not link VNDK libraries to system from vendor/product default am: ba00a9897f
Kiyoung Kim [Tue, 19 May 2020 07:32:36 +0000 (07:32 +0000)]
Do not link VNDK libraries to system from vendor/product default am: ba00a9897f

Change-Id: If2f6516c7b5d38c8acbdbabfce4e828777ce0a3b

4 years agoDo not link stub libraries from all namespaces
Kiyoung Kim [Fri, 15 May 2020 05:26:23 +0000 (14:26 +0900)]
Do not link stub libraries from all namespaces

In current linkerconfig from all namespaces stub libraries are linked to
system namespace, which was required for APEX namespaces. However, as
linkerconfig checks dependencies from APEX namespaces now, this link is
excessive and can create unexpected interface from system. This change
removes redundant stub library link so namespaces can link to system
image with minimum set of libraries.

Bug: 156563692
Test: m -j passed && crosshatch_hwasasn booted
Change-Id: If43c954f376ede65bd2c3f682be6ae5d6866d3df
Merged-In: If43c954f376ede65bd2c3f682be6ae5d6866d3df

4 years agoDo not link VNDK libraries to system from vendor/product default
Kiyoung Kim [Thu, 14 May 2020 07:25:15 +0000 (16:25 +0900)]
Do not link VNDK libraries to system from vendor/product default

There was an issue that P vendor fails with Wifi because ubsan
libclangrt was linked to system even the library was in VNDK. This
change removes vndk libraries from sanitizer library list when linking
from vendor/product default so we can stick on partition's own VNDK
library.

Bug: 155907604
Test: Tested with cuttlefish
Change-Id: I7c23c6ba5f263a716b44778c9441dde68943259b
Merged-In: I7c23c6ba5f263a716b44778c9441dde68943259b

4 years agoUpdate test data with latest codebase am: 829bc09525
Kiyoung Kim [Mon, 11 May 2020 09:33:46 +0000 (09:33 +0000)]
Update test data with latest codebase am: 829bc09525

Change-Id: I2a702abd469dca36f4b21db313577bcbb2932711

4 years agoUpdate test data with latest codebase
Kiyoung Kim [Mon, 11 May 2020 05:24:52 +0000 (14:24 +0900)]
Update test data with latest codebase

Some of the changes are not reflected to the test code output. This
change updates testdata using the latest codebase.

Bug: 156099573
Test: generated with rundiff.sh --update
Change-Id: I4dcc73058f827ac363cd555a073ef0f30848059e

4 years agoMerge "Add sphal and vndk namespaces to unrestricted" am: 7769450af6
Treehugger Robot [Mon, 11 May 2020 04:54:14 +0000 (04:54 +0000)]
Merge "Add sphal and vndk namespaces to unrestricted" am: 7769450af6

Change-Id: I62561019cb4e59f6d747b6ec1835fd4a90c8de16

4 years agoMerge "Add sphal and vndk namespaces to unrestricted"
Treehugger Robot [Mon, 11 May 2020 04:37:25 +0000 (04:37 +0000)]
Merge "Add sphal and vndk namespaces to unrestricted"

4 years agoAdd sphal and vndk namespaces to unrestricted
Yiwei Zhang [Fri, 8 May 2020 18:21:33 +0000 (11:21 -0700)]
Add sphal and vndk namespaces to unrestricted

Binary executables compiled against libvulkan or libEGL/libGLES*
fundamentally depend on sphal libraries for their functionality. On
production builds, instead of building APKs, devs are always allowed to
use NDK toolchain to build binaries and push to /data/local/tmp to run.

Devs are doing such as to avoid issues with bundling resources,
extracting output, slower build times and flakier perf numbers. It's
also the preferred way for test factory which have cross-platform
devices, because they can automate the process using the same script if
using binary executables.

This change adds the sphal and vndk namespaces to unrestricted
configuration. This change also makes rs an optional namespace for sphal
namespace as it's only needed in system configuration. In addition, this
change has updated vndk namespace generation accordingly.

Bug: 156099573
Test: atest --test-mapping system/linkerconfig
Test: push a Vulkan binary to /data/local/tmp and run
Merged-In: Id09dbcf2ab33a599960f471cbc1b142b6d3eaa1a
Change-Id: Id09dbcf2ab33a599960f471cbc1b142b6d3eaa1a

4 years ago"Make com_android_i18n namespace visible" Attempt 2 am: 6fb8b5b1a9
Victor Chang [Thu, 7 May 2020 09:51:23 +0000 (09:51 +0000)]
"Make com_android_i18n namespace visible" Attempt 2 am: 6fb8b5b1a9

Change-Id: I317f172db8608baf98fe19ef737cfd3dbb490395

4 years ago"Make com_android_i18n namespace visible" Attempt 2
Victor Chang [Tue, 5 May 2020 15:17:35 +0000 (16:17 +0100)]
"Make com_android_i18n namespace visible" Attempt 2

This reverts commit 6c8203f28990363fc0bdb125f13138b2d5f7d544.
Reland https://r.android.com/1288092

Bug: 138994281
Test: CtsJniTestCases
Change-Id: Iba05e69926916aff32a60144fd05448c03b9c088

4 years agoRevert "Make com_android_i18n namespace visible" am: 6c8203f289
vichang [Tue, 5 May 2020 12:00:52 +0000 (12:00 +0000)]
Revert "Make com_android_i18n namespace visible" am: 6c8203f289

Change-Id: I4f3ac76ab74935fdeda985245f50013b5abb6d2d

4 years agoRevert "Make com_android_i18n namespace visible"
vichang [Tue, 5 May 2020 11:11:30 +0000 (11:11 +0000)]
Revert "Make com_android_i18n namespace visible"

Revert submission 1299494-i18nApex

Reason for revert: Breaking aosp_x86-eng on aosp-master
Reverted Changes:
I30fc3735b:Move ICU from ART APEX to i18n APEX
Icb7e98b5c:Calling @IntraCoreApi from core-icu4j should not c...
Ic7de63fe3:Move core-icu4j into I18n APEX
I65b97bdba:Make com_android_i18n namespace visible
Ia4c83bc15:Move v8 and libpac into i18n APEX
I10e6d4948:Move core-icu4j into i18n APEX
I8d989cad7:Move ICU from ART APEX into i18n APEX
I72216ca12:Move ICU into i18n APEX
Ief9dace85:Add shared library into i18n APEX and add the requ...
I7d97a10ba:Move libpac into i18n APEX
I90fff9c55:Move ICU from ART APEX into i18n APEX

Change-Id: I8e170a25fb334c12af5c2fe4a1fb4afafd56d096

4 years agoMake com_android_i18n namespace visible am: 84d3247b54
Victor Chang [Tue, 5 May 2020 09:03:58 +0000 (09:03 +0000)]
Make com_android_i18n namespace visible am: 84d3247b54

Change-Id: I34bae003711e039983536baafa3166e09db97652

4 years agoMake com_android_i18n namespace visible
Victor Chang [Thu, 16 Apr 2020 18:50:13 +0000 (19:50 +0100)]
Make com_android_i18n namespace visible

libnativeloader calls android_get_exported_namespace to link
this namepsace to classloader namespace.

Bug: 138994281
Test: CtsJniTestCases
Change-Id: I65b97bdba462a11d7389b84d873c4daa9c08b45d

4 years agoDO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master
Xin Li [Fri, 10 Apr 2020 00:51:28 +0000 (17:51 -0700)]
DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master

Bug: 151763422
Change-Id: Ide5d6cedcd1bade47ea7ed391062bf915c10b2a8

4 years agoMerge changes from topic "lc_sphal" am: e89356e8e7 am: 2bf8ba3027
Kiyoung Kim [Thu, 2 Apr 2020 08:58:43 +0000 (08:58 +0000)]
Merge changes from topic "lc_sphal" am: e89356e8e7 am: 2bf8ba3027

Change-Id: I8706e17d211ec40f6e1caf2267ae2be31a6e1453

4 years agoMove libz from VNDKSP to LLNDK in case of VNDK Lite am: 14530493f6 am: 7f89917084
Kiyoung Kim [Thu, 2 Apr 2020 08:58:42 +0000 (08:58 +0000)]
Move libz from VNDKSP to LLNDK in case of VNDK Lite am: 14530493f6 am: 7f89917084

Change-Id: I37baf74d8fd74bcfd81025356c01f6b844888998

4 years agoAdd legacy test configuration am: 71b4bf30cf am: b4104c6db4
Jooyung Han [Thu, 2 Apr 2020 08:58:34 +0000 (08:58 +0000)]
Add legacy test configuration am: 71b4bf30cf am: b4104c6db4

Change-Id: Id9727da7feb49704e9557711fa03ff9dec68dfd6

4 years agoMerge changes from topic "lc_sphal" am: e89356e8e7
Kiyoung Kim [Thu, 2 Apr 2020 08:34:22 +0000 (08:34 +0000)]
Merge changes from topic "lc_sphal" am: e89356e8e7

Change-Id: If9a1ad45570daf231a927b5493d33555f6667e26

4 years agoMove libz from VNDKSP to LLNDK in case of VNDK Lite am: 14530493f6
Kiyoung Kim [Thu, 2 Apr 2020 08:34:19 +0000 (08:34 +0000)]
Move libz from VNDKSP to LLNDK in case of VNDK Lite am: 14530493f6

Change-Id: Iaad65474633d1cb054638fb1def5d42fa466e3b0

4 years agoAdd legacy test configuration am: 71b4bf30cf
Jooyung Han [Thu, 2 Apr 2020 08:34:04 +0000 (08:34 +0000)]
Add legacy test configuration am: 71b4bf30cf

Change-Id: I621252a9071bf6189b760b63415b0cc29c570a12

4 years agoMerge changes from topic "lc_sphal"
Kiyoung Kim [Thu, 2 Apr 2020 08:24:56 +0000 (08:24 +0000)]
Merge changes from topic "lc_sphal"

* changes:
  Allow SPHAL namespace to access system in case of legacy
  Move libz from VNDKSP to LLNDK in case of VNDK Lite

4 years agoAdd legacy test configuration
Jooyung Han [Thu, 2 Apr 2020 06:40:41 +0000 (15:40 +0900)]
Add legacy test configuration

And deprecated --legacy option.

Instead, to run linkerconfig with legacy mode, run it without -v option.
(-v is for setting vndk version).
For example,
  $ linkerconfig -r <root> -t <target>

Legacy mode:
  ro.vndk.version is not set and VNDK is not available.
  but other apexes are available.

Bug: 140599044
Test: ./rundiff.sh
Change-Id: I81cba2d6c6466737fcb4dd33407837b016c42b78

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

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
Merged-In: I22eb76619c1242ab26c1d611a08b98177b08285c

4 years agoAdd more configurations for rundiff tests am: 0441fd330b am: 16f9afef28
Jooyung Han [Tue, 31 Mar 2020 15:27:25 +0000 (15:27 +0000)]
Add more configurations for rundiff tests am: 0441fd330b am: 16f9afef28

Change-Id: I701d6bbd4bb19bd1bf66547f7ba8ea28a4293c21

4 years agoAdd more configurations for rundiff tests am: 0441fd330b
Jooyung Han [Tue, 31 Mar 2020 15:12:16 +0000 (15:12 +0000)]
Add more configurations for rundiff tests am: 0441fd330b

Change-Id: I7b046d2378f0ea002418369b857d2c48585f8bbd

4 years agoRefactor rundiff.sh am: 77d84bdee3 am: 488d457650
Jooyung Han [Tue, 31 Mar 2020 14:58:57 +0000 (14:58 +0000)]
Refactor rundiff.sh am: 77d84bdee3 am: 488d457650

Change-Id: I5f49094d25a2144d36cba594dbce6fbdd95c9bd6

4 years agoRefactor rundiff.sh am: 77d84bdee3
Jooyung Han [Tue, 31 Mar 2020 14:44:17 +0000 (14:44 +0000)]
Refactor rundiff.sh am: 77d84bdee3

Change-Id: I1798f74bedb3b4f4dc9e8b611ac4e8466cded23c

4 years agoAdd more configurations for rundiff tests
Jooyung Han [Tue, 31 Mar 2020 07:14:56 +0000 (16:14 +0900)]
Add more configurations for rundiff tests

stage0:
  no apexes. this configuration corresponds to the one for
  apexd-bootstrap process.

stage1:
  with bootstrap apexes. this corresponds to the one right after
  apexd-bootstrap finishes

stage2:
  with all apexes. this corresponds to the one for every other
  processes.

product-enabled:
  ro.product.vndk.version is set.

vndk-lite:
  ro.vndk.lite is set to true.

Bug: 140599044
Test: ./rundiff.sh
Change-Id: If7dc6aedf05e2078643e52559c580de425693dc5

4 years agoRefactor rundiff.sh
Jooyung Han [Tue, 31 Mar 2020 06:44:53 +0000 (15:44 +0900)]
Refactor rundiff.sh

(copied from reverted d283fb913db051ef0653c9ea1af5d2d865dbbbf0)

. Add --update to update golden_output
. Do not rely on ANDROID_BUILD_TOP (required to be run on cloud)

Bug: n/a
Test: ./rundiff.sh # no changes
Change-Id: I098dabd2c5cd06f18a806cf66f593ea930f02945

4 years agoRevert "Make diff test as presubmit" am: 9750b6cffc am: eb90db8630
Jooyung Han [Tue, 24 Mar 2020 09:33:30 +0000 (09:33 +0000)]
Revert "Make diff test as presubmit" am: 9750b6cffc am: eb90db8630

Change-Id: Ic08e50df5877f5bcd7ae846c1dee594a3f45e16d

4 years agoRevert "Make diff test as presubmit" am: 9750b6cffc
Jooyung Han [Tue, 24 Mar 2020 09:17:14 +0000 (09:17 +0000)]
Revert "Make diff test as presubmit" am: 9750b6cffc

Change-Id: I8e68b2d58a3152633eb7e0e43fe09c0d36a2ce2f

4 years agoRevert "Make diff test as presubmit"
Jooyung Han [Tue, 24 Mar 2020 07:33:00 +0000 (07:33 +0000)]
Revert "Make diff test as presubmit"

This reverts commit d283fb913db051ef0653c9ea1af5d2d865dbbbf0.

Reason for revert: flaky (b/152265282)

Change-Id: Ie73fd1967384281f3e727b2482bf1ee7ffec38d5

4 years agoMake diff test as presubmit am: d283fb913d am: 0f6363490b
Jooyung Han [Mon, 23 Mar 2020 07:55:38 +0000 (07:55 +0000)]
Make diff test as presubmit am: d283fb913d am: 0f6363490b

Change-Id: Ie0a1c334cda46c784cd04c19807aa50c268320bf

4 years agoMake diff test as presubmit am: d283fb913d
Jooyung Han [Mon, 23 Mar 2020 07:35:14 +0000 (07:35 +0000)]
Make diff test as presubmit am: d283fb913d

Change-Id: Idec7b43a759745bd5d30d37c7dd3f2b3c9f95089

4 years agoMake diff test as presubmit
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: Ib7a026ca5cb794a614279ce2eee53c6ef8219d1f

4 years agoUpdate testdata/golden_output am: e4f6ccdc08 am: 372c60ddd2
Jooyung Han [Fri, 20 Mar 2020 11:48:43 +0000 (11:48 +0000)]
Update testdata/golden_output am: e4f6ccdc08 am: 372c60ddd2

Change-Id: I0db5bb07cfb60722d8fe62dfc8740e4cf9af6c39

4 years agoUpdate testdata/golden_output am: e4f6ccdc08
Jooyung Han [Fri, 20 Mar 2020 11:36:33 +0000 (11:36 +0000)]
Update testdata/golden_output am: e4f6ccdc08

Change-Id: Iac946bf2f7d295c3a384f0a34beb6c18e7fb887d

4 years agoUpdate testdata/golden_output
Jooyung Han [Fri, 20 Mar 2020 05:55:47 +0000 (14:55 +0900)]
Update testdata/golden_output

libselinux.so is added to system_stub_libraries in
74d75a773d200542ac3439fc166aa87ef40e0104

Bug: 151053366
Test: ./rundiff.sh
Change-Id: Id69eded5f144958676d2b4b72774efa4fb82211f

4 years agoDO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am...
Xin Li [Thu, 19 Mar 2020 04:22:47 +0000 (04:22 +0000)]
DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 15e6d5369b

Change-Id: I18dd654febb0a32aad6fc16d3213478ec12aca7d

4 years agoDO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master
Xin Li [Thu, 19 Mar 2020 02:40:57 +0000 (19:40 -0700)]
DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master

Bug: 151763422
Change-Id: Id48957dd365fb876c24660d0e92a78deac196c70

4 years agoMerge "Make libseliux a stub library" am: 7587c35384 am: 265081fd7a
Automerger Merge Worker [Thu, 12 Mar 2020 03:31:16 +0000 (03:31 +0000)]
Merge "Make libseliux a stub library" am: 7587c35384 am: 265081fd7a

Change-Id: I7c65d3dbd307c09372abdd665f0d6e293fedc936

4 years agoMerge "Make libseliux a stub library" am: 7587c35384
Automerger Merge Worker [Thu, 12 Mar 2020 03:09:59 +0000 (03:09 +0000)]
Merge "Make libseliux a stub library" am: 7587c35384

Change-Id: I04c586676ef32c7dffd8c892fc81ebf43629e4c1

4 years agoMerge "Make libseliux a stub library"
Treehugger Robot [Thu, 12 Mar 2020 02:57:14 +0000 (02:57 +0000)]
Merge "Make libseliux a stub library"

4 years agoUpdate test data am: 63e8818e63 am: 46a8f03913
Automerger Merge Worker [Thu, 12 Mar 2020 01:43:12 +0000 (01:43 +0000)]
Update test data am: 63e8818e63 am: 46a8f03913

Change-Id: I8c640e5e1fe44b024f74a50aec2c6b9e6d018f5d

4 years agoRemove libstatssocket from variableloader. am: 8a3f93ad76 am: aed746a757
Automerger Merge Worker [Thu, 12 Mar 2020 01:43:10 +0000 (01:43 +0000)]
Remove libstatssocket from variableloader. am: 8a3f93ad76 am: aed746a757

Change-Id: I50f39bf8fe6420e25544a596da0eb79f75cef38b

4 years agoUpdate test data am: 63e8818e63
Automerger Merge Worker [Thu, 12 Mar 2020 01:27:37 +0000 (01:27 +0000)]
Update test data am: 63e8818e63

Change-Id: I6affe3fbf833443f94edc9b27ac9caad10cdf274

4 years agoRemove libstatssocket from variableloader. am: 8a3f93ad76
Automerger Merge Worker [Thu, 12 Mar 2020 01:27:33 +0000 (01:27 +0000)]
Remove libstatssocket from variableloader. am: 8a3f93ad76

Change-Id: Ibdf94f58d8f1264622cbeb5e251a1f041aed6565

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)'.

Change-Id: I445db2d0c5103b8b3267caa094f5d91259f1f491

4 years agoUpdate test data
Kiyoung Kim [Mon, 9 Mar 2020 07:42:01 +0000 (16:42 +0900)]
Update test data

Update test data based on the latest update - removing libstatssocket.so
from stub libraries.

Test: ./rundiff.sh passed
Change-Id: I47c2e0104e89f3dbfed15e2e586f416f988b578c

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
Merged-In: I5630321d26e208b540c408f82d3f9759dd1a9c14

4 years agoRemove cronet apex from visible_apexes am: a8eeddac31 am: 6fe877f5f9
Automerger Merge Worker [Wed, 4 Mar 2020 06:26:03 +0000 (06:26 +0000)]
Remove cronet apex from visible_apexes am: a8eeddac31 am: 6fe877f5f9

Change-Id: I6001fbd7f1d6adc4f58242bea7e135a7cca0e98c

4 years agoGenerates jni.config.txt am: 8e5cc8d49e am: 5538e3db4b
Automerger Merge Worker [Wed, 4 Mar 2020 06:25:24 +0000 (06:25 +0000)]
Generates jni.config.txt am: 8e5cc8d49e am: 5538e3db4b

Change-Id: Ib731eae7e620a26ace5aa2fc0f8b80391b17b634

4 years agoRemove cronet apex from visible_apexes am: a8eeddac31
Automerger Merge Worker [Wed, 4 Mar 2020 06:15:18 +0000 (06:15 +0000)]
Remove cronet apex from visible_apexes am: a8eeddac31

Change-Id: I84d40640f1e3130500ca03e5015555043be6af0b

4 years agoGenerates jni.config.txt am: 8e5cc8d49e
Automerger Merge Worker [Wed, 4 Mar 2020 06:14:44 +0000 (06:14 +0000)]
Generates jni.config.txt am: 8e5cc8d49e

Change-Id: I14823f7d785294f63d75bef6a094ae19b66c934a

4 years agoRemove cronet apex from visible_apexes
Jooyung Han [Mon, 2 Mar 2020 16:02:22 +0000 (01:02 +0900)]
Remove cronet apex from visible_apexes

It is now automatically set as visible because it has jni_libs.

Bug: 146420818
Bug: 143733063
Test: CronetApiTest
Change-Id: I7d506e63aece907d7cc00b405aca23a196f9a3db

4 years agoGenerates jni.config.txt
Jooyung Han [Mon, 2 Mar 2020 15:34:32 +0000 (00:34 +0900)]
Generates jni.config.txt

This file is consumed by libnativeloader so that JNI libraries in an
APEX can be loaded from classloader-namespace created for java libraries
in the same apex.

Bug: 143733063
Bug: 146420818
Test: ./rundiff.sh
Change-Id: I4b80d5c1c2a10cd6b644187e6ddd416c22cddf27

4 years agoMerge "Make APEXes with JNI libs "visible" in "system" section" am: b263b8a15e am...
Automerger Merge Worker [Fri, 28 Feb 2020 17:32:51 +0000 (17:32 +0000)]
Merge "Make APEXes with JNI libs "visible" in "system" section" am: b263b8a15e am: 52dffc0886

Change-Id: I7ffec29bf06c26ceca06823813029144f4992472

4 years agoMerge "Make APEXes with JNI libs "visible" in "system" section" am: b263b8a15e
Automerger Merge Worker [Fri, 28 Feb 2020 17:23:09 +0000 (17:23 +0000)]
Merge "Make APEXes with JNI libs "visible" in "system" section" am: b263b8a15e

Change-Id: I4563d296129763cdbefe0d90a49c03ceef7b1380

4 years agoMerge "Make APEXes with JNI libs "visible" in "system" section"
Jooyung Han [Fri, 28 Feb 2020 17:12:53 +0000 (17:12 +0000)]
Merge "Make APEXes with JNI libs "visible" in "system" section"

4 years agoMake sphal and vndk namespace available from legacy devices am: 8a550bb09b am: 2227c28841
Automerger Merge Worker [Wed, 26 Feb 2020 12:38:47 +0000 (12:38 +0000)]
Make sphal and vndk namespace available from legacy devices am: 8a550bb09b am: 2227c28841

Change-Id: I1c7814e20ff9e96db99083e4e38073ce7b941f9b

4 years agoMake sphal and vndk namespace available from legacy devices am: 8a550bb09b
Automerger Merge Worker [Wed, 26 Feb 2020 12:23:42 +0000 (12:23 +0000)]
Make sphal and vndk namespace available from legacy devices am: 8a550bb09b

Change-Id: Icd04634f47edbaef5e95d5aef682512fe6740c37

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 agoReplace the hardcoded ART namespace config with an autogenerated one. am: 0e9de4a5d7...
Automerger Merge Worker [Tue, 25 Feb 2020 13:29:58 +0000 (13:29 +0000)]
Replace the hardcoded ART namespace config with an autogenerated one. am: 0e9de4a5d7 am: 04def3c191

Change-Id: Iecdc7a3b8a7c54896845a8bb755d926a7ad46b06

4 years agoRename ART APEX directory to what it is on device. am: b7e0ae0c97 am: e351b07b0b
Automerger Merge Worker [Tue, 25 Feb 2020 13:29:50 +0000 (13:29 +0000)]
Rename ART APEX directory to what it is on device. am: b7e0ae0c97 am: e351b07b0b

Change-Id: I63b5739b4e18fead6027fb42b062860cb8ce3603

4 years agoReplace the hardcoded ART namespace config with an autogenerated one. am: 0e9de4a5d7
Automerger Merge Worker [Tue, 25 Feb 2020 13:09:19 +0000 (13:09 +0000)]
Replace the hardcoded ART namespace config with an autogenerated one. am: 0e9de4a5d7

Change-Id: Ifb50a8da35d31a5dc531ac940985216f409267bd

4 years agoRename ART APEX directory to what it is on device. am: b7e0ae0c97
Automerger Merge Worker [Tue, 25 Feb 2020 13:09:08 +0000 (13:09 +0000)]
Rename ART APEX directory to what it is on device. am: b7e0ae0c97

Change-Id: Id5070761eb98f45c78f08245af0f35e7470341e7

4 years agoExit on failure in rundiff.sh. am: 73cccc439c am: e0d3d3aaf7
Automerger Merge Worker [Tue, 25 Feb 2020 05:56:07 +0000 (05:56 +0000)]
Exit on failure in rundiff.sh. am: 73cccc439c am: e0d3d3aaf7

Change-Id: If8bd6ec38c801ed0c518eca0247b67c962e59a14

4 years agoExit on failure in rundiff.sh. am: 73cccc439c
Automerger Merge Worker [Tue, 25 Feb 2020 05:43:55 +0000 (05:43 +0000)]
Exit on failure in rundiff.sh. am: 73cccc439c

Change-Id: I86a4678d6d3bf1ce3928e5d1c2611d8ca9febdea

4 years agoUpdate golden linkerconfig from change in https://r.android.com/1242397. am: 957847eb...
Automerger Merge Worker [Tue, 25 Feb 2020 01:53:18 +0000 (01:53 +0000)]
Update golden linkerconfig from change in https://r.android.com/1242397. am: 957847ebd3 am: aa4167ac12

Change-Id: I3848b3b747c352f3114444fc1a80cbd6c2ba537d

4 years agoUpdate golden linkerconfig from change in https://r.android.com/1242397. am: 957847ebd3
Automerger Merge Worker [Tue, 25 Feb 2020 01:42:33 +0000 (01:42 +0000)]
Update golden linkerconfig from change in https://r.android.com/1242397. am: 957847ebd3

Change-Id: I9b0554ee04db0fbf4c9d343d44816b904aadbbeb

4 years agoReplace the hardcoded ART namespace config with an autogenerated one.
Martin Stjernholm [Fri, 21 Feb 2020 20:25:43 +0000 (20:25 +0000)]
Replace the hardcoded ART namespace config with an autogenerated one.

Test: Build and boot
Test: system/linkerconfig/rundiff.sh
Bug: 147082642
Change-Id: If6e45da6823180c8ef36f066753bdba167f64df5

4 years agoRename ART APEX directory to what it is on device.
Martin Stjernholm [Mon, 24 Feb 2020 17:21:56 +0000 (17:21 +0000)]
Rename ART APEX directory to what it is on device.

Preparation to make an InitializeWithApex call in art.cc produce the
right paths.

Test: system/linkerconfig/rundiff.sh
Bug: 147082642
Change-Id: If6116a906dcd0ec983dec8746ab004cb0c835f58

4 years agoExit on failure in rundiff.sh.
Martin Stjernholm [Mon, 24 Feb 2020 17:18:38 +0000 (17:18 +0000)]
Exit on failure in rundiff.sh.

In particular, don't show a diff created with an old binary if
linkerconfig failed to compile.

Test: system/linkerconfig/rundiff.sh
  (with and without a syntax error in a linkerconfig .cc file)
Bug: 140599044
Change-Id: I1449de75d20e8a40f26bac087048f869a0f468a5

4 years agoUpdate golden linkerconfig from change in https://r.android.com/1242397.
Martin Stjernholm [Mon, 24 Feb 2020 16:03:06 +0000 (16:03 +0000)]
Update golden linkerconfig from change in https://r.android.com/1242397.

Test: system/linkerconfig/rundiff.sh
Bug: 140599044
Change-Id: Ia4cdf12bcc37564951cbfc7ea286fd3bc1a6a933

4 years agoMerge "Add golden output of linkerconfig" am: 2c87cccfbd am: a1eed93a5c
Automerger Merge Worker [Sat, 22 Feb 2020 13:53:58 +0000 (13:53 +0000)]
Merge "Add golden output of linkerconfig" am: 2c87cccfbd am: a1eed93a5c

Change-Id: I3c7f498a6bc16a04604587a686ebe28ccccb3716

4 years agoMerge "Add golden output of linkerconfig" am: 2c87cccfbd
Automerger Merge Worker [Sat, 22 Feb 2020 13:38:21 +0000 (13:38 +0000)]
Merge "Add golden output of linkerconfig" am: 2c87cccfbd

Change-Id: I549a7f2f90e9b1a9e78f56ac1b0684588740bd98

4 years agoMerge "Add golden output of linkerconfig"
Treehugger Robot [Sat, 22 Feb 2020 13:27:30 +0000 (13:27 +0000)]
Merge "Add golden output of linkerconfig"

4 years agoMake APEXes with JNI libs "visible" in "system" section
Jooyung Han [Tue, 18 Feb 2020 06:28:55 +0000 (15:28 +0900)]
Make APEXes with JNI libs "visible" in "system" section

It could be done by explicitly listing them when building "system"
section. This change does it automatically by checking if an apex has
jni libs in it.

Bug: 149363889
Test: atest --host linkerconfig_contents_fulltest
      build/boots

Change-Id: Ibb23268ab3e5dcfe0a8f8f1c98f7594c083eafac

4 years agoMerge "Add libadbd_fs to list of stub dependencies." am: e04eef3242 am: 018990bfe0
Automerger Merge Worker [Sat, 22 Feb 2020 00:41:30 +0000 (00:41 +0000)]
Merge "Add libadbd_fs to list of stub dependencies." am: e04eef3242 am: 018990bfe0

Change-Id: I6754282d971a953848641c581954ca298b128929

4 years agoMerge "Add libadbd_fs to list of stub dependencies." am: e04eef3242
Automerger Merge Worker [Sat, 22 Feb 2020 00:22:14 +0000 (00:22 +0000)]
Merge "Add libadbd_fs to list of stub dependencies." am: e04eef3242

Change-Id: I283fdcd61aec1b236fe91cff9c54a66898be2587

4 years agoMerge "Add libadbd_fs to list of stub dependencies."
Josh Gao [Sat, 22 Feb 2020 00:03:21 +0000 (00:03 +0000)]
Merge "Add libadbd_fs to list of stub dependencies."

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."