diff options
| author | Alistair Delva <adelva@google.com> | 2022-02-08 12:11:45 -0800 |
|---|---|---|
| committer | Alistair Delva <adelva@google.com> | 2022-02-08 20:59:29 +0000 |
| commit | 15a4232b72644ae16f72c822dd193bf199b93a22 (patch) | |
| tree | ce502885e6bddbde81a0f9e59bdaa3645dcdf8af /apex | |
| parent | 3fc1d66410464ff2e67f2c30fd2010232577ca79 (diff) | |
| download | cuttlefish-15a4232b72644ae16f72c822dd193bf199b93a22.tar.gz | |
Fix linkerconfig for com.google.cf.rild
Fixes linker failure in rild when built as a vapex.
Bug: 203699028
Change-Id: Ib878d2e4086213bc2bb3e3afa7b33b6a0590e1eb
Diffstat (limited to 'apex')
| -rw-r--r-- | apex/com.google.cf.rild/Android.bp | 7 | ||||
| -rw-r--r-- | apex/com.google.cf.rild/ld.config.txt | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/apex/com.google.cf.rild/Android.bp b/apex/com.google.cf.rild/Android.bp index ecea755cd..9e237b519 100644 --- a/apex/com.google.cf.rild/Android.bp +++ b/apex/com.google.cf.rild/Android.bp @@ -22,6 +22,12 @@ prebuilt_etc { installable: false, } +prebuilt_etc { + name: "ld.config.txt", + src: "ld.config.txt", + installable: false, +} + apex { name: "com.google.cf.rild", manifest: "apex_manifest.json", @@ -42,6 +48,7 @@ apex { "android.hardware.telephony.gsm.prebuilt.xml", "android.hardware.telephony.ims.prebuilt.xml", "com.google.cf.rild.rc", + "ld.config.txt", ], vintf_fragments: [":libril-modem-lib-manifests"], overrides: [ diff --git a/apex/com.google.cf.rild/ld.config.txt b/apex/com.google.cf.rild/ld.config.txt new file mode 100644 index 000000000..c08835794 --- /dev/null +++ b/apex/com.google.cf.rild/ld.config.txt @@ -0,0 +1,7 @@ +dir.myapex = /apex/com.google.cf.rild/bin + +[myapex] +additional.namespaces = vndk +namespace.default.search.paths = /apex/com.google.cf.rild/${LIB} +# For android.hardware.radio-service.compat +namespace.vndk.permitted.paths = /vendor/${LIB}/hw |