Merge "snapuserd: Don't statically link outside of ramdisk." into main
diff --git a/fs_mgr/libsnapshot/snapuserd/Android.bp b/fs_mgr/libsnapshot/snapuserd/Android.bp
index 649309d..f040205 100644
--- a/fs_mgr/libsnapshot/snapuserd/Android.bp
+++ b/fs_mgr/libsnapshot/snapuserd/Android.bp
@@ -145,14 +145,6 @@
],
include_dirs: ["bionic/libc/kernel"],
- system_shared_libs: [],
-
- // snapuserd is started during early boot by first-stage init. At that
- // point, /system is mounted using the "dm-user" device-mapper kernel
- // module. dm-user routes all I/O to userspace to be handled by
- // snapuserd, which would lead to deadlock if we had to handle page
- // faults for its code pages.
- static_executable: true,
}
cc_binary {
@@ -165,10 +157,10 @@
"libsnapuserd_client",
],
ramdisk_available: false,
- vendor_ramdisk_available: true,
+ vendor_ramdisk_available: false,
}
-// This target will install to /system/bin/snapuserd_ramdisk
+// This target will install to /system/bin/snapuserd_ramdisk
// It will also create a symblink on /system/bin/snapuserd that point to
// /system/bin/snapuserd_ramdisk .
// This way, init can check if generic ramdisk copy exists.
@@ -184,6 +176,15 @@
vendor_ramdisk_available: false,
ramdisk: true,
symlinks: ["snapuserd"],
+
+ system_shared_libs: [],
+
+ // snapuserd is started during early boot by first-stage init. At that
+ // point, /system is mounted using the "dm-user" device-mapper kernel
+ // module. dm-user routes all I/O to userspace to be handled by
+ // snapuserd, which would lead to deadlock if we had to handle page
+ // faults for its code pages.
+ static_executable: true,
}
cc_defaults {