Merge "Remove init_second_stage.recovery dep."
diff --git a/adb/Android.bp b/adb/Android.bp
index a18dc1a..41e752f 100644
--- a/adb/Android.bp
+++ b/adb/Android.bp
@@ -353,7 +353,6 @@
"libcutils",
"libext4_utils",
"libfec",
- "libfec_rs",
"libfs_mgr",
"liblog",
"libmdnssd",
diff --git a/fastboot/device/variables.cpp b/fastboot/device/variables.cpp
index a5dead2..65cfea3 100644
--- a/fastboot/device/variables.cpp
+++ b/fastboot/device/variables.cpp
@@ -123,10 +123,14 @@
}
std::string slot_suffix = device->GetCurrentSlot();
if (slot_suffix.empty()) {
- return device->WriteFail("Invalid slot");
+ return device->WriteOkay("no");
}
- std::string result = (args[0] == "userdata" ? "no" : "yes");
- return device->WriteOkay(result);
+ std::string partition_name = args[0] + slot_suffix;
+ if (FindPhysicalPartition(partition_name) ||
+ LogicalPartitionExists(partition_name, slot_suffix)) {
+ return device->WriteOkay("yes");
+ }
+ return device->WriteOkay("no");
}
bool GetPartitionSize(FastbootDevice* device, const std::vector<std::string>& args) {
diff --git a/fs_mgr/Android.bp b/fs_mgr/Android.bp
index 6167cde..3cce0e8 100644
--- a/fs_mgr/Android.bp
+++ b/fs_mgr/Android.bp
@@ -48,18 +48,15 @@
"fs_mgr_overlayfs.cpp",
],
shared_libs: [
- "libfec",
- "libfec_rs",
"libbase",
- "libcrypto_utils",
"libcrypto",
+ "libcrypto_utils",
"libcutils",
"libext4_utils",
- "libkeyutils",
+ "libfec",
"liblog",
- "libsquashfs_utils",
- "libselinux",
"liblp",
+ "libselinux",
],
static_libs: [
"libavb",
diff --git a/libsuspend/Android.bp b/libsuspend/Android.bp
index b3e36c2..c5f1f5e 100644
--- a/libsuspend/Android.bp
+++ b/libsuspend/Android.bp
@@ -2,11 +2,6 @@
cc_library {
name: "libsuspend",
- vendor_available: true,
- vndk: {
- enabled: true,
- },
-
srcs: [
"autosuspend.c",
"autosuspend_wakeup_count.cpp",