OSDN Git Service

android-x86/system-linkerconfig.git
4 years agoMerge "Add system link for libfdtrack.so" am: 464a34be4b am: 071b9132ff
Josh Gao [Thu, 28 May 2020 03:42:25 +0000 (03:42 +0000)]
Merge "Add system link for libfdtrack.so" am: 464a34be4b am: 071b9132ff

Change-Id: I33ceb77ba7d0fb84f5d791b4f243516e9756e3bc

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 agoUpdate golden_output
Jooyung Han [Wed, 27 May 2020 13:24:59 +0000 (22:24 +0900)]
Update golden_output

When cherry-picking from rvc-dev to aosp, golden_output changes were
skipped by auto-merger in the rvc-dev-plus-aosp and its downstream
branches.

Bug: n/a
Test: ./rundiff.sh
Change-Id: Icc9110bc011c5727a6a9e814ba49c70cc58045b9

4 years ago[automerger skipped] Do not isolate sphal and vndk from unrestricted am: 2d44cfc444...
Kiyoung Kim [Wed, 27 May 2020 08:31:18 +0000 (08:31 +0000)]
[automerger skipped] Do not isolate sphal and vndk from unrestricted am: 2d44cfc444 am: 8b6decd193 -s ours

am skip reason: Change-Id Ib1526e225971312f126d75f26d7aa5c523011922 with SHA-1 2e13598eb9 is in history

Change-Id: Iac2f419a6bdb43cac6e33503a75d05d69f59c797

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 agoDo not isolate sphal and vndk from unrestricted am: 2e13598eb9
Kiyoung Kim [Wed, 27 May 2020 06:20:15 +0000 (06:20 +0000)]
Do not isolate sphal and vndk from unrestricted am: 2e13598eb9

Change-Id: Ie06086a92be9c8c8494fb2bd99305f16ca673ce3

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

4 years agoAdd system link for libfdtrack.so am: f6142e5933
Josh Gao [Wed, 20 May 2020 20:32:44 +0000 (20:32 +0000)]
Add system link for libfdtrack.so am: f6142e5933

Change-Id: Ifba1f2a36387ad44da47dc72a6cc01848259df04

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 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 ago[automerger skipped] Do not link stub libraries from all namespaces am: fd8cf9340b...
Kiyoung Kim [Tue, 19 May 2020 08:00:02 +0000 (08:00 +0000)]
[automerger skipped] Do not link stub libraries from all namespaces am: fd8cf9340b am: e1d805cade -s ours

am skip reason: Change-Id If43c954f376ede65bd2c3f682be6ae5d6866d3df with SHA-1 1ef9da8571 is in history

Change-Id: Id0ee8a7aa54d95f5c74cf8c0fcb5fb2b4a324386

4 years ago[automerger skipped] Do not link VNDK libraries to system from vendor/product default...
Kiyoung Kim [Tue, 19 May 2020 08:00:01 +0000 (08:00 +0000)]
[automerger skipped] Do not link VNDK libraries to system from vendor/product default am: ba00a9897f am: d88a39e8c6 -s ours

am skip reason: Change-Id I7c23c6ba5f263a716b44778c9441dde68943259b with SHA-1 e37bcb119f is in history

Change-Id: I5d2d6544ece60ef978906756e72e0ef31bce592b

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 agoDo not link stub libraries from all namespaces am: 1ef9da8571
Kiyoung Kim [Tue, 19 May 2020 01:22:14 +0000 (01:22 +0000)]
Do not link stub libraries from all namespaces am: 1ef9da8571

Change-Id: I47274e781f6c5f990200829884ad392b47dbe1e8

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

4 years agoDo not link VNDK libraries to system from vendor/product default am: e37bcb119f
Kiyoung Kim [Fri, 15 May 2020 07:20:46 +0000 (07:20 +0000)]
Do not link VNDK libraries to system from vendor/product default am: e37bcb119f

Change-Id: Idd13de5077a0e9a55c86ae11e2d0a801b9686bec

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

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

Change-Id: Ica0635dc9660bd593d5aff4c7748a307cd1fb0f3

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 ago[automerger skipped] Merge "Add sphal and vndk namespaces to unrestricted" am: 776945...
Treehugger Robot [Mon, 11 May 2020 05:09:08 +0000 (05:09 +0000)]
[automerger skipped] Merge "Add sphal and vndk namespaces to unrestricted" am: 7769450af6 am: b34a013e0b -s ours

am skip reason: Change-Id Id09dbcf2ab33a599960f471cbc1b142b6d3eaa1a with SHA-1 8da3a9d92f is in history

Change-Id: I8674f7ba060dce815b790d2b03e29b542f96a94d

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 am: 8da3a9d92f
Yiwei Zhang [Mon, 11 May 2020 03:34:22 +0000 (03:34 +0000)]
Add sphal and vndk namespaces to unrestricted am: 8da3a9d92f

Change-Id: Id9defac3064a23bbc4861fbfdc7e249cf066ef33

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 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
Change-Id: Id09dbcf2ab33a599960f471cbc1b142b6d3eaa1a

4 years ago"Make com_android_i18n namespace visible" Attempt 2 am: 6fb8b5b1a9 am: f5e215ee7d
Victor Chang [Thu, 7 May 2020 10:12:06 +0000 (10:12 +0000)]
"Make com_android_i18n namespace visible" Attempt 2 am: 6fb8b5b1a9 am: f5e215ee7d

Change-Id: I5712e4ed98fd76ed1cc667c1e3140c25c317d7da

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 am: fa8055e6f1
vichang [Tue, 5 May 2020 12:16:16 +0000 (12:16 +0000)]
Revert "Make com_android_i18n namespace visible" am: 6c8203f289 am: fa8055e6f1

Change-Id: I5848926801ff8bef472ff5432b3da02bc40a40ad

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 am: c4cc7301ca
Victor Chang [Tue, 5 May 2020 09:33:15 +0000 (09:33 +0000)]
Make com_android_i18n namespace visible am: 84d3247b54 am: c4cc7301ca

Change-Id: I36971ecc2b1e057633388876aa4b54e44bad5cce

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 agoMatch vendor requires with system from VNDK Lite am: fde439ab45
Kiyoung Kim [Wed, 15 Apr 2020 17:01:28 +0000 (17:01 +0000)]
Match vendor requires with system from VNDK Lite am: fde439ab45

Change-Id: I88490f10d19f4c54803f8d3013c2d1cf5ba5e7b3

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
Change-Id: Ie15838b0506b3fcd617f624572f1a560eda07987

4 years ago[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp...
Xin Li [Fri, 10 Apr 2020 03:26:09 +0000 (03:26 +0000)]
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 018c4fbe32 -s ours

am skip reason: subject contains skip directive

Change-Id: Ia54259ed808e289c5869a857a529238fda2f4390

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 agoAdd libandroidicu.so link for VNDK-Lite vendor am: 9811370003
Kiyoung Kim [Thu, 9 Apr 2020 04:16:53 +0000 (04:16 +0000)]
Add libandroidicu.so link for VNDK-Lite vendor am: 9811370003

Change-Id: I31d6021c19685181a384da6603d5777c720e0bf4

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 ago[automerger skipped] Allow SPHAL namespace to access system in case of legacy am...
Kiyoung Kim [Fri, 3 Apr 2020 00:57:23 +0000 (00:57 +0000)]
[automerger skipped] Allow SPHAL namespace to access system in case of legacy am: 91a9e2544e -s ours

am skip reason: Change-Id I93fc82a36cf3c2ee33c9bd1f2bb8371bb2d6d700 with SHA-1 17b877fd96 is in history

Change-Id: I523e64980b0e30ee15672da5eabc082522261531

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 am: 2bf8ba3027
Kiyoung Kim [Thu, 2 Apr 2020 08:57:58 +0000 (08:57 +0000)]
Merge changes from topic "lc_sphal" am: e89356e8e7 am: 2bf8ba3027

Change-Id: I418bbbeb5426a9f794b735e4ec946d8e02957f93

4 years ago[automerger skipped] Move libz from VNDKSP to LLNDK in case of VNDK Lite am: 14530493...
Kiyoung Kim [Thu, 2 Apr 2020 08:57:55 +0000 (08:57 +0000)]
[automerger skipped] Move libz from VNDKSP to LLNDK in case of VNDK Lite am: 14530493f6 am: 7f89917084 -s ours

am skip reason: Change-Id I22eb76619c1242ab26c1d611a08b98177b08285c with SHA-1 b38d2f5ff3 is in history

Change-Id: Ieaa9fe54e02d55b57ab169b09e0ffe114b7a7d57

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

Change-Id: I25350af9ff016c9841e2addf674c1492846d77fe

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 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 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 agoMove libz from VNDKSP to LLNDK in case of VNDK Lite am: b38d2f5ff3
Kiyoung Kim [Wed, 1 Apr 2020 01:15:26 +0000 (01:15 +0000)]
Move libz from VNDKSP to LLNDK in case of VNDK Lite am: b38d2f5ff3

Change-Id: I7fd6044b50fe18f3093cb492dcc679ce5ae95281

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 am: 16f9afef28
Jooyung Han [Tue, 31 Mar 2020 15:27:14 +0000 (15:27 +0000)]
Add more configurations for rundiff tests am: 0441fd330b am: 16f9afef28

Change-Id: I28e3caa37c3106a53f4933abce758daf4565aace

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 am: 488d457650
Jooyung Han [Tue, 31 Mar 2020 14:58:49 +0000 (14:58 +0000)]
Refactor rundiff.sh am: 77d84bdee3 am: 488d457650

Change-Id: Icd486402c22612872e9e94098ce87867737f7ed3

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 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 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 am: eb90db8630
Jooyung Han [Tue, 24 Mar 2020 09:33:19 +0000 (09:33 +0000)]
Revert "Make diff test as presubmit" am: 9750b6cffc am: eb90db8630

Change-Id: I810916086fe5afbf8565500124aaaec73f680ee1

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 agoAdd extra test mapping with GTS test am: 27776d2b03
Kiyoung Kim [Tue, 24 Mar 2020 04:48:30 +0000 (04:48 +0000)]
Add extra test mapping with GTS test am: 27776d2b03

Change-Id: I0596a5a3376cfe823129984b6d1f1077a6599479

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 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 am: 0f6363490b
Jooyung Han [Mon, 23 Mar 2020 07:55:36 +0000 (07:55 +0000)]
Make diff test as presubmit am: d283fb913d am: 0f6363490b

Change-Id: I06f590ffd362480c6721643e5a7f4e90fe07623f

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 am: 372c60ddd2
Jooyung Han [Fri, 20 Mar 2020 11:48:39 +0000 (11:48 +0000)]
Update testdata/golden_output am: e4f6ccdc08 am: 372c60ddd2

Change-Id: I583a22b7d1265b29ea16bc4e6c22650c8b88ed3a

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 ago[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into...
Xin Li [Thu, 19 Mar 2020 04:19:39 +0000 (04:19 +0000)]
[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 15e6d5369b -s ours

am skip reason: subject contains skip directive

Change-Id: Ie8157c8af7de77f221096679b51d9adc8daad652

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 ago[automerger skipped] Make libseliux a stub library am: fd3929db02 -s ours
Automerger Merge Worker [Fri, 13 Mar 2020 05:39:31 +0000 (05:39 +0000)]
[automerger skipped] Make libseliux a stub library am: fd3929db02 -s ours

am skip reason: Change-Id I445db2d0c5103b8b3267caa094f5d91259f1f491 with SHA-1 74d75a773d is in history

Change-Id: I750da60867177784593cf8de5014b74f3a2b0c99

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 am: 265081fd7a
Automerger Merge Worker [Thu, 12 Mar 2020 03:31:03 +0000 (03:31 +0000)]
Merge "Make libseliux a stub library" am: 7587c35384 am: 265081fd7a

Change-Id: I580a47db0618b7cdcf3b54654aa27f303cc81a87

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 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 am: 46a8f03913
Automerger Merge Worker [Thu, 12 Mar 2020 01:43:07 +0000 (01:43 +0000)]
Update test data am: 63e8818e63 am: 46a8f03913

Change-Id: Idf65e6f1e470b4f9540ee3aba4ac55b0eab583a6

4 years ago[automerger skipped] Remove libstatssocket from variableloader. am: 8a3f93ad76 am...
Automerger Merge Worker [Thu, 12 Mar 2020 01:43:05 +0000 (01:43 +0000)]
[automerger skipped] Remove libstatssocket from variableloader. am: 8a3f93ad76 am: aed746a757 -s ours

am skip reason: Change-Id I5630321d26e208b540c408f82d3f9759dd1a9c14 with SHA-1 cdb4c0a3b9 is in history

Change-Id: If81da08b5b3a168894c846e4d646f0d2b2be3afb

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