diff options
| author | Martin Stjernholm <mast@google.com> | 2020-08-05 22:26:26 +0100 |
|---|---|---|
| committer | Martin Stjernholm <mast@google.com> | 2020-08-06 11:21:40 +0100 |
| commit | d6e35f1cc85ca4077dad93845ab1ca0fa2041ad9 (patch) | |
| tree | 70b47004b52f878a1395b5279c3c10a82b38582e /apex | |
| parent | 159b140661b032f6f9b2706d9def471e6c115aa9 (diff) | |
Add linkerconfig to the host exports.
ART runs it on host to create the linker config for its chroot test
environment. This avoids problems building linkerconfig in the reduced
master-art manifest.
Even though linkerconfig currently is in platform/system I'm adding it
to the Bionic module exports based on discussions that the linkerconfig
binary should be part of the Runtime (Bionic) APEX due to its close
ties to the linker.
Test: build/soong/scripts/build-aml-prebuilts.sh runtime-module-host-exports
then try the prebuilt snapshot with art/tools/buildbot-build.sh in
master-art
Bug: 162819454
Change-Id: I4d43d7f0b980af48b193d5eb358e4f010eea541b
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/Android.bp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/apex/Android.bp b/apex/Android.bp index ce9d82bdf..100430da4 100644 --- a/apex/Android.bp +++ b/apex/Android.bp @@ -65,10 +65,14 @@ sdk { module_exports { name: "runtime-module-host-exports", - defaults: ["linux_bionic_supported"], + host_supported: true, device_supported: false, + compile_multilib: "64", - native_binaries: [ - "linker", - ], + native_binaries: ["linkerconfig"], + target: { + linux_bionic: { + native_binaries: ["linker"], + }, + }, } |