Merge "fs_mgr: remove -Wno-unused-variable from cflags"

am: fc216d664a

Change-Id: Ia378eb64aa3df5564d7bd5aa4c1fc8160174b9af
This commit is contained in:
Tom Cherry 2018-12-13 10:49:33 -08:00 committed by android-build-merger
commit b65ce990fa
3 changed files with 0 additions and 3 deletions

View file

@ -23,7 +23,6 @@ cc_defaults {
cflags: [ cflags: [
"-Wall", "-Wall",
"-Werror", "-Werror",
"-Wno-unused-variable",
], ],
} }

View file

@ -32,7 +32,6 @@ std::string fs_mgr_get_slot_suffix() {
// Updates |fstab| for slot_suffix. Returns true on success, false on error. // Updates |fstab| for slot_suffix. Returns true on success, false on error.
bool fs_mgr_update_for_slotselect(Fstab* fstab) { bool fs_mgr_update_for_slotselect(Fstab* fstab) {
int n;
std::string ab_suffix; std::string ab_suffix;
for (auto& entry : *fstab) { for (auto& entry : *fstab) {

View file

@ -84,7 +84,6 @@ std::string SerializeMetadata(const LpMetadata& input) {
// with potentially invalid metadata, or random partition data with metadata. // with potentially invalid metadata, or random partition data with metadata.
static bool ValidateAndSerializeMetadata(const IPartitionOpener& opener, const LpMetadata& metadata, static bool ValidateAndSerializeMetadata(const IPartitionOpener& opener, const LpMetadata& metadata,
const std::string& slot_suffix, std::string* blob) { const std::string& slot_suffix, std::string* blob) {
const LpMetadataHeader& header = metadata.header;
const LpMetadataGeometry& geometry = metadata.geometry; const LpMetadataGeometry& geometry = metadata.geometry;
*blob = SerializeMetadata(metadata); *blob = SerializeMetadata(metadata);