Dependency cleanup for snapshot .bp
Reorder, remove and fix some of the dependencies in the Android.bp for
snapshot.
Test: m, snapshot_test, OTA
Bug: 142513589
Change-Id: Id214a8d6453a5675e60cda4352094dc3987292ec
Signed-off-by: Alessio Balsini <balsini@google.com>
diff --git a/fs_mgr/libsnapshot/Android.bp b/fs_mgr/libsnapshot/Android.bp
index 447265a..ad48b82 100644
--- a/fs_mgr/libsnapshot/Android.bp
+++ b/fs_mgr/libsnapshot/Android.bp
@@ -24,14 +24,13 @@
],
shared_libs: [
"libbase",
+ "libcutils",
"liblog",
"liblp",
],
static_libs: [
- "libcutils",
"libdm",
"libfstab",
- "liblp",
"update_metadata-protos",
],
whole_static_libs: [
@@ -146,8 +145,8 @@
],
static_libs: [
"libfs_mgr",
- "libgtest",
"libgmock",
+ "libgtest",
],
}
@@ -155,29 +154,28 @@
name: "libsnapshot_test",
defaults: ["libsnapshot_defaults"],
srcs: [
- "snapshot_test.cpp",
"partition_cow_creator_test.cpp",
"snapshot_metadata_updater_test.cpp",
- "test_helpers.cpp",
+ "snapshot_test.cpp",
],
shared_libs: [
- "libbinder",
- "libcrypto",
- "libhidlbase",
- "libprotobuf-cpp-lite",
- "libutils",
- ],
- static_libs: [
"android.hardware.boot@1.0",
"android.hardware.boot@1.1",
+ "libbinder",
+ "libcrypto",
"libfs_mgr",
- "libgmock",
"libgsi",
+ "libhidlbase",
"liblp",
+ "libprotobuf-cpp-lite",
+ "libsparse",
+ "libutils",
+ "libz",
+ ],
+ static_libs: [
+ "libgmock",
"libsnapshot",
"libsnapshot_test_helpers",
- "libsparse",
- "libz",
],
header_libs: [
"libstorage_literals_headers",
@@ -192,7 +190,6 @@
],
static_libs: [
"libdm",
- "libext2_uuid",
"libfstab",
"libsnapshot",
],
@@ -202,6 +199,7 @@
"libbase",
"libbinder",
"libbinderthreadstate",
+ "libext2_uuid",
"libext4_utils",
"libfs_mgr_binder",
"libhidlbase",