diff options
| author | Justin DeMartino <jjdemartino@google.com> | 2020-09-21 13:23:58 -0700 |
|---|---|---|
| committer | Justin DeMartino <jjdemartino@google.com> | 2020-09-21 13:23:58 -0700 |
| commit | 7e4fe6a28b718ab97c08811566238af2893ca65b (patch) | |
| tree | 5413a5ec890b5a1ac4fbbe4548b5014e41a2591b /apex | |
| parent | dcdcb3fa15004669823a3a118189d9d72ff30852 (diff) | |
| parent | ab08b955a34423d53b28a6210e7530e67241af4a (diff) | |
Merge SP1A.200921.001
Change-Id: Id2ab019914bb555dadf52c46b8403c0d5fb3c20a
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/Android.bp | 22 | ||||
| -rw-r--r-- | apex/linker.config.txt | 6 |
2 files changed, 24 insertions, 4 deletions
diff --git a/apex/Android.bp b/apex/Android.bp index ce9d82bdf..c6c4cbf09 100644 --- a/apex/Android.bp +++ b/apex/Android.bp @@ -36,6 +36,9 @@ apex { }, key: "com.android.runtime.key", certificate: ":com.android.runtime.certificate", + prebuilts: [ + "bionic-linker-config", + ], } sdk { @@ -65,10 +68,21 @@ 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"], + }, + }, +} + +prebuilt_etc { + name: "bionic-linker-config", + src: "linker.config.txt", + filename: "linker.config.txt", + installable: false, } diff --git a/apex/linker.config.txt b/apex/linker.config.txt new file mode 100644 index 000000000..7bac3d65c --- /dev/null +++ b/apex/linker.config.txt @@ -0,0 +1,6 @@ +# Extra linker configurations for bionic APEX +# See https://android.googlesource.com/platform/system/linkerconfig/+/master/README.md#apex_etc_linker_config_txt + +[properties] +# Set bionic APEX as force visible so bionic APEX namespace is accessible via android_get_exported_namespace +visible = true |