1 files changed, 115 insertions, 47 deletions

diff --git a/fs_mgr/libsnapshot/Android.bp b/fs_mgr/libsnapshot/Android.bp
index 6db8f139f..6a764e4fa 100644
--- a/fs_mgr/libsnapshot/Android.bp
+++ b/fs_mgr/libsnapshot/Android.bp
@@ -118,7 +118,6 @@ cc_library_static {
     native_coverage : true,
     defaults: ["libsnapshot_defaults"],
     srcs: [":libsnapshot_sources"],
-    ramdisk_available: true,
     recovery_available: true,
     cflags: [
         "-DLIBSNAPSHOT_NO_COW_WRITE",
@@ -182,6 +181,38 @@ cc_library_static {
     vendor_ramdisk_available: true,
 }
 
+cc_defaults {
+    name: "libsnapshot_snapuserd_defaults",
+    defaults: [
+        "fs_mgr_defaults",
+    ],
+    cflags: [
+        "-D_FILE_OFFSET_BITS=64",
+        "-Wall",
+        "-Werror",
+    ],
+    export_include_dirs: ["include"],
+    srcs: [
+        "snapuserd_client.cpp",
+    ],
+}
+
+cc_library_static {
+    name: "libsnapshot_snapuserd",
+    defaults: [
+        "libsnapshot_snapuserd_defaults",
+    ],
+    recovery_available: true,
+    static_libs: [
+        "libcutils_sockets",
+    ],
+    shared_libs: [
+        "libbase",
+        "liblog",
+    ],
+    ramdisk_available: true,
+}
+
 cc_library_static {
     name: "libsnapshot_test_helpers",
     defaults: ["libsnapshot_defaults"],
@@ -236,7 +267,6 @@ cc_defaults {
         "libbrotli",
         "libc++fs",
         "libfs_mgr_binder",
-        "libgflags",
         "libgsi",
         "libgmock",
         "liblp",
@@ -252,9 +282,7 @@ cc_defaults {
         "vts",
         "device-tests"
     ],
-    test_options: {
-        min_shipping_api_level: 29,
-    },
+    test_min_api_level: 29,
     auto_gen_config: true,
     require_root: true,
 }
@@ -264,35 +292,6 @@ cc_test {
     defaults: ["libsnapshot_test_defaults"],
 }
 
-sh_test {
-    name: "run_snapshot_tests",
-    src: "run_snapshot_tests.sh",
-    test_suites: [
-        "device-tests",
-    ],
-    required: [
-        "vts_libsnapshot_test",
-    ],
-}
-
-cc_test {
-    name: "vts_ota_config_test",
-    srcs: [
-        "vts_ota_config_test.cpp",
-    ],
-    shared_libs: [
-        "libbase",
-    ],
-    test_suites: [
-        "vts",
-    ],
-    test_options: {
-        min_shipping_api_level: 33,
-    },
-    auto_gen_config: true,
-    require_root: true,
-}
-
 cc_binary {
     name: "snapshotctl",
     srcs: [
@@ -311,6 +310,7 @@ cc_binary {
         "android.hardware.boot@1.0",
         "android.hardware.boot@1.1",
         "libbase",
+        "libbinder",
         "libext2_uuid",
         "libext4_utils",
         "libfs_mgr_binder",
@@ -412,6 +412,49 @@ cc_test {
     require_root: true,
 }
 
+cc_defaults {
+    name: "snapuserd_defaults",
+    defaults: [
+        "fs_mgr_defaults",
+    ],
+    srcs: [
+        "snapuserd_server.cpp",
+        "snapuserd.cpp",
+        "snapuserd_daemon.cpp",
+        "snapuserd_worker.cpp",
+        "snapuserd_readahead.cpp",
+    ],
+
+    cflags: [
+        "-Wall",
+        "-Werror"
+    ],
+
+    static_libs: [
+        "libbase",
+        "libbrotli",
+        "libcutils_sockets",
+        "libdm",
+        "libgflags",
+        "liblog",
+        "libsnapshot_cow",
+        "libz",
+    ],
+}
+
+cc_binary {
+    name: "snapuserd",
+    defaults: ["snapuserd_defaults"],
+    init_rc: [
+        "snapuserd.rc",
+    ],
+    static_executable: true,
+    system_shared_libs: [],
+    ramdisk_available: true,
+    vendor_ramdisk_available: true,
+    recovery_available: true,
+}
+
 cc_test {
     name: "cow_api_test",
     defaults: [
@@ -439,9 +482,7 @@ cc_test {
     test_suites: [
         "device-tests"
     ],
-    test_options: {
-        min_shipping_api_level: 30,
-    },
+    test_min_api_level: 30,
     auto_gen_config: true,
     require_root: false,
     host_supported: true,
@@ -515,6 +556,43 @@ cc_binary {
     },
 }
 
+cc_test {
+    name: "cow_snapuserd_test",
+    defaults: [
+        "fs_mgr_defaults",
+    ],
+    srcs: [
+        "cow_snapuserd_test.cpp",
+        "snapuserd.cpp",
+        "snapuserd_worker.cpp",
+    ],
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+    shared_libs: [
+        "libbase",
+        "liblog",
+    ],
+    static_libs: [
+        "libbrotli",
+        "libgtest",
+        "libsnapshot_cow",
+        "libsnapshot_snapuserd",
+        "libcutils_sockets",
+        "libz",
+        "libfs_mgr",
+        "libdm",
+    ],
+    header_libs: [
+        "libstorage_literals_headers",
+        "libfiemap_headers",
+    ],
+    test_min_api_level: 30,
+    auto_gen_config: true,
+    require_root: false,
+}
+
 cc_binary {
     name: "inspect_cow",
     host_supported: true,
@@ -538,13 +616,3 @@ cc_binary {
         "inspect_cow.cpp",
     ],
 }
-
-python_library_host {
-    name: "snapshot_proto_python",
-    srcs: [
-        "android/snapshot/snapshot.proto",
-    ],
-    proto: {
-        canonical_path_from_root: false,
-    },
-}