Drop -Wno-unused-parameter.

The only one left is libedify. Will handle that in a separate CL.

Test: mmma bootable/recovery
Change-Id: I732a5f85229da90fd767bee2e46c5c95f529c396
This commit is contained in:
Tao Bao 2016-10-13 12:46:38 -07:00
parent 46d8a3b604
commit 99f0d9e52b
10 changed files with 62 additions and 49 deletions

View file

@ -94,7 +94,7 @@ endif
endif
LOCAL_CFLAGS += -DRECOVERY_API_VERSION=$(RECOVERY_API_VERSION)
LOCAL_CFLAGS += -Wall -Wno-unused-parameter -Werror
LOCAL_CFLAGS += -Wall -Werror
ifneq ($(TARGET_RECOVERY_UI_MARGIN_HEIGHT),)
LOCAL_CFLAGS += -DRECOVERY_UI_MARGIN_HEIGHT=$(TARGET_RECOVERY_UI_MARGIN_HEIGHT)
@ -173,9 +173,7 @@ LOCAL_STATIC_LIBRARIES := \
libcutils \
libutils \
liblog \
libselinux \
libm \
libc
libselinux
LOCAL_HAL_STATIC_LIBRARIES := libhealthd

View file

@ -24,8 +24,7 @@ LOCAL_CFLAGS := \
-D_FILE_OFFSET_BITS=64 \
-Werror \
-Wall \
-Wextra \
-Wno-unused-parameter
-Wextra
LOCAL_SHARED_LIBRARIES := liblog
LOCAL_STATIC_LIBRARIES := libbootloader_message libfs_mgr libbase
LOCAL_POST_INSTALL_CMD := \

View file

@ -1,13 +1,26 @@
# Copyright 2005 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
LOCAL_PATH:= $(call my-dir)
minadbd_cflags := \
-Wall -Werror \
-Wno-unused-parameter \
-Wno-missing-field-initializers \
-DADB_HOST=0 \
# libadbd (static library)
# ===============================
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
@ -24,6 +37,8 @@ LOCAL_STATIC_LIBRARIES := libcrypto libbase
include $(BUILD_STATIC_LIBRARY)
# minadbd_test (native test)
# ===============================
include $(CLEAR_VARS)
LOCAL_MODULE := minadbd_test

View file

@ -58,7 +58,7 @@ static int create_service_thread(void (*func)(int, const std::string&), const st
return s[0];
}
int service_to_fd(const char* name, const atransport* transport) {
int service_to_fd(const char* name, const atransport* /* transport */) {
int ret = -1;
if (!strncmp(name, "sideload:", 9)) {

View file

@ -13,6 +13,9 @@
# limitations under the License.
LOCAL_PATH := $(call my-dir)
# libminui (static library)
# ===============================
include $(CLEAR_VARS)
LOCAL_SRC_FILES := \
@ -66,6 +69,8 @@ endif
include $(BUILD_STATIC_LIBRARY)
# libminui (shared library)
# ===============================
# Used by OEMs for factory test images.
include $(CLEAR_VARS)
LOCAL_MODULE := libminui

View file

@ -1214,8 +1214,7 @@ static Device::BuiltinAction prompt_and_wait(Device* device, int status) {
}
}
static void
print_property(const char *key, const char *name, void *cookie) {
static void print_property(const char* key, const char* name, void* /* cookie */) {
printf("%s=%s\n", key, name);
}
@ -1250,8 +1249,8 @@ void ui_print(const char* format, ...) {
static constexpr char log_characters[] = "VDIWEF";
void UiLogger(android::base::LogId id, android::base::LogSeverity severity,
const char* tag, const char* file, unsigned int line,
void UiLogger(android::base::LogId /* id */, android::base::LogSeverity severity,
const char* /* tag */, const char* /* file */, unsigned int /* line */,
const char* message) {
if (severity >= android::base::ERROR && ui != nullptr) {
ui->Print("E:%s\n", message);

View file

@ -24,18 +24,18 @@ class StubRecoveryUI : public RecoveryUI {
public:
StubRecoveryUI() = default;
void SetBackground(Icon icon) override {}
void SetSystemUpdateText(bool security_update) override {}
void SetBackground(Icon /* icon */) override {}
void SetSystemUpdateText(bool /* security_update */) override {}
// progress indicator
void SetProgressType(ProgressType type) override {}
void ShowProgress(float portion, float seconds) override {}
void SetProgress(float fraction) override {}
void SetProgressType(ProgressType /* type */) override {}
void ShowProgress(float /* portion */, float /* seconds */) override {}
void SetProgress(float /* fraction */) override {}
void SetStage(int current, int max) override {}
void SetStage(int /* current */, int /* max */) override {}
// text log
void ShowText(bool visible) override {}
void ShowText(bool /* visible */) override {}
bool IsTextVisible() override {
return false;
}
@ -50,12 +50,12 @@ class StubRecoveryUI : public RecoveryUI {
vprintf(fmt, ap);
va_end(ap);
}
void PrintOnScreenOnly(const char* fmt, ...) override {}
void ShowFile(const char* filename) override {}
void PrintOnScreenOnly(const char* /* fmt */, ...) override {}
void ShowFile(const char* /* filename */) override {}
// menu display
void StartMenu(const char* const* headers, const char* const* items,
int initial_selection) override {}
void StartMenu(const char* const* /* headers */, const char* const* /* items */,
int /* initial_selection */) override {}
int SelectMenu(int sel) override {
return sel;
}

View file

@ -67,7 +67,6 @@ LOCAL_C_INCLUDES := \
LOCAL_CFLAGS := \
-Wall \
-Wno-unused-parameter \
-Werror
LOCAL_EXPORT_C_INCLUDE_DIRS := \
@ -93,7 +92,6 @@ LOCAL_C_INCLUDES := \
LOCAL_CFLAGS := \
-Wall \
-Wno-unused-parameter \
-Werror
LOCAL_STATIC_LIBRARIES := \

View file

@ -53,7 +53,7 @@ int VrRecoveryUI::DrawHorizontalRule(int y) const {
return y + 4;
}
void VrRecoveryUI::DrawHighlightBar(int x, int y, int width, int height) const {
void VrRecoveryUI::DrawHighlightBar(int /* x */, int y, int /* width */, int height) const {
gr_fill(kMarginWidth + kStereoOffset, y, ScreenWidth() - kMarginWidth + kStereoOffset, y + height);
gr_fill(ScreenWidth() + kMarginWidth - kStereoOffset, y,
gr_fb_width() - kMarginWidth - kStereoOffset, y + height);

View file

@ -150,8 +150,7 @@ void WearRecoveryUI::update_progress_locked() {
gr_flip();
}
void WearRecoveryUI::SetStage(int current, int max) {
}
void WearRecoveryUI::SetStage(int /* current */, int /* max */) {}
void WearRecoveryUI::StartMenu(const char* const* headers, const char* const* items,
int initial_selection) {