Merge "libsnapshot: CHECK -> CHECK_EQ" into main
diff --git a/fs_mgr/libsnapshot/scratch_super.cpp b/fs_mgr/libsnapshot/scratch_super.cpp
index 805abf3..93c4bbd 100644
--- a/fs_mgr/libsnapshot/scratch_super.cpp
+++ b/fs_mgr/libsnapshot/scratch_super.cpp
@@ -98,7 +98,6 @@
}
const auto& opener = info->GetPartitionOpener();
std::string slot_suffix = info->GetSlotSuffix();
- int slot = SlotNumberForSlotSuffix(slot_suffix);
// Walk both the slots and clean up metadata related to scratch space from
// both the slots.
for (auto slot : slots) {
diff --git a/rootdir/Android.bp b/rootdir/Android.bp
index 5f0a2c3..44acbba 100644
--- a/rootdir/Android.bp
+++ b/rootdir/Android.bp
@@ -50,10 +50,15 @@
recovery_available: true,
}
+filegroup {
+ name: "system_linker_config_json_file",
+ srcs: ["etc/linker.config.json"],
+}
+
// TODO(b/147210213) Generate list of libraries during build and fill in at build time
linker_config {
name: "system_linker_config",
- src: "etc/linker.config.json",
+ src: ":system_linker_config_json_file",
installable: false,
}