aboutsummaryrefslogtreecommitdiff
path: root/apex
diff options
context:
space:
mode:
authorAlistair Delva <adelva@google.com>2022-02-08 23:53:45 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-02-08 23:53:45 +0000
commitbc6ba02297537032a5effd077822dce20540103b (patch)
tree4ecff8187ad7a755fcc0448cc57f2b38ecac67f8 /apex
parent589941c07679eae770c25e5d67bf4c3774007198 (diff)
parent0fc6c44aa383d912762e6367d94fb8843d2c57dd (diff)
downloadcuttlefish-bc6ba02297537032a5effd077822dce20540103b.tar.gz
Fix linkerconfig for com.google.cf.rild am: 15a4232b72 am: a6b12e93d4 am: a961058ce3 am: 0fc6c44aa3
Original change: https://android-review.googlesource.com/c/device/google/cuttlefish/+/1976533 Change-Id: I35142a013170721f91f8ece863f07fcfe29b9751
Diffstat (limited to 'apex')
-rw-r--r--apex/com.google.cf.rild/Android.bp7
-rw-r--r--apex/com.google.cf.rild/ld.config.txt7
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