libsnapshot: Build snapuserd and its dependencies into vendor_ramdisk.
For GKI devices, snapuserd should be in vendor_boot.
Bug: 173463595
Test: manual test
Change-Id: I1df18a2f3f2b67605187f18b4f7b6b3cf4f89674
diff --git a/fs_mgr/libdm/Android.bp b/fs_mgr/libdm/Android.bp
index a0bc44d..0efe384 100644
--- a/fs_mgr/libdm/Android.bp
+++ b/fs_mgr/libdm/Android.bp
@@ -43,6 +43,7 @@
},
},
ramdisk_available: true,
+ vendor_ramdisk_available: true,
}
filegroup {
diff --git a/fs_mgr/libsnapshot/Android.bp b/fs_mgr/libsnapshot/Android.bp
index 910911e..34049d4 100644
--- a/fs_mgr/libsnapshot/Android.bp
+++ b/fs_mgr/libsnapshot/Android.bp
@@ -174,6 +174,7 @@
"libz",
],
ramdisk_available: true,
+ vendor_ramdisk_available: true,
}
cc_defaults {
@@ -408,9 +409,9 @@
"fs_mgr_defaults",
],
srcs: [
- "snapuserd_server.cpp",
- "snapuserd.cpp",
- "snapuserd_daemon.cpp",
+ "snapuserd_server.cpp",
+ "snapuserd.cpp",
+ "snapuserd_daemon.cpp",
],
cflags: [
@@ -421,7 +422,7 @@
static_libs: [
"libbase",
"libbrotli",
- "libcutils_sockets",
+ "libcutils_sockets",
"liblog",
"libdm",
"libz",
@@ -436,15 +437,9 @@
"snapuserd.rc",
],
static_executable: true,
-}
-
-cc_binary {
- name: "snapuserd_ramdisk",
- stem: "snapuserd",
- defaults: ["snapuserd_defaults"],
-
- ramdisk: true,
- static_executable: true,
+ system_shared_libs: [],
+ ramdisk_available: true,
+ vendor_ramdisk_available: true,
}
cc_test {
@@ -568,7 +563,7 @@
"libsnapshot_snapuserd",
"libcutils_sockets",
"libz",
- "libdm",
+ "libdm",
],
header_libs: [
"libstorage_literals_headers",