commit a9e6057dadfcd37af4519efa7987d809ce46ac1a
author Treehugger Robot <treehugger-gerrit@google.com> Fri Dec 04 02:54:47 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 04 02:54:47 2020 +0000
tree 9fc87179de68bf8365b77ec84eee25d6540285cc
parent 78edd704ab1c60a6ea7d98597be9c2ea6658f5d4
parent feef4d390ff508a4154bc8ff39ebc5e32f77f054

Merge "Add product_available to product available modules"

fs_mgr/libsnapshot/Android.bp

diff --git a/fs_mgr/libsnapshot/Android.bp b/fs_mgr/libsnapshot/Android.bp
index 0664b6d..e32fde0 100644
--- a/fs_mgr/libsnapshot/Android.bp
+++ b/fs_mgr/libsnapshot/Android.bp
@@ -439,15 +439,7 @@
     static_executable: true,
     system_shared_libs: [],
     ramdisk_available: true,
-}
-
-cc_binary {
-    name: "snapuserd.vendor_ramdisk",
-    stem: "snapuserd",
-    defaults: ["snapuserd_defaults"],
-    static_executable: true,
-    system_shared_libs: [],
-    vendor_ramdisk: true,
+    vendor_ramdisk_available: true,
 }
 
 cc_test {

init/builtins.cpp

diff --git a/init/builtins.cpp b/init/builtins.cpp
index b235d2f..c44e03e 100644
--- a/init/builtins.cpp
+++ b/init/builtins.cpp
@@ -1232,7 +1232,7 @@
 }
 
 static Result<void> GenerateLinkerConfiguration() {
-    const char* linkerconfig_binary = "/system/bin/linkerconfig";
+    const char* linkerconfig_binary = "/apex/com.android.runtime/bin/linkerconfig";
     const char* linkerconfig_target = "/linkerconfig";
     const char* arguments[] = {linkerconfig_binary, "--target", linkerconfig_target};
 

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index 78679a3..2de066d 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -56,7 +56,7 @@
     write /sys/module/dm_verity/parameters/prefetch_cluster 0
 
     # Generate ld.config.txt for early executed processes
-    exec -- /system/bin/linkerconfig --target /linkerconfig/bootstrap
+    exec -- /system/bin/bootstrap/linkerconfig --target /linkerconfig/bootstrap
     chmod 644 /linkerconfig/bootstrap/ld.config.txt
     copy /linkerconfig/bootstrap/ld.config.txt /linkerconfig/default/ld.config.txt
     chmod 644 /linkerconfig/default/ld.config.txt