commit 63dd9e28ef1badd211f84107895ce6a9e713110b
author Jooyung Han <jooyung@google.com> Wed Dec 14 00:58:52 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 14 00:58:52 2022 +0000
tree 2b4fedf3da7d661a02f368b8e31edf7c5c2fd5a4
parent 58231374423dacd0f97e3bf5a07a2d5fd15afcdd
parent 8389345c596c20008955661e674ac2faaa1d31e9

Merge "Remove bootstrap linkerconfig from microdroid"

microdroid/Android.bp

diff --git a/microdroid/Android.bp b/microdroid/Android.bp
index 2669a32..2b8e03f 100644
--- a/microdroid/Android.bp
+++ b/microdroid/Android.bp
@@ -71,7 +71,6 @@
         "atrace",
         "debuggerd",
         "linker",
-        "linkerconfig",
         "tombstoned.microdroid",
         "tombstone_transmit.microdroid",
         "cgroups.json",

microdroid/init.rc

diff --git a/microdroid/init.rc b/microdroid/init.rc
index a48ba4b..7402481 100644
--- a/microdroid/init.rc
+++ b/microdroid/init.rc
@@ -17,6 +17,10 @@
 
     start ueventd
 
+    # Generate empty linker config to suppress warnings
+    write /linkerconfig/ld.config.txt \#
+    chmod 644 /linkerconfig/ld.config.txt
+
 # If VM is debuggable, send logs to outside ot the VM via the serial console.
 # If non-debuggable, logs are internally consumed at /dev/null
 on early-init && property:ro.boot.microdroid.debuggable=1