Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a0aa553 authored by Andreas Gampe's avatar Andreas Gampe Committed by Android Git Automerger
Browse files

am e80c01e8: Merge "Frameworks/base: Turn on -Wall -Werror in cmds"

* commit 'e80c01e8':
  Frameworks/base: Turn on -Wall -Werror in cmds
parents 1b0dbd5c e80c01e8
Loading
Loading
Loading
Loading
+18 −13
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ LOCAL_MODULE:= app_process
LOCAL_MULTILIB := both
LOCAL_MODULE_STEM_32 := app_process32
LOCAL_MODULE_STEM_64 := app_process64

LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code

include $(BUILD_EXECUTABLE)

# Create a symlink from app_process to app_process32 or 64
@@ -54,6 +57,8 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_EXECUTABLES)/asan
LOCAL_MODULE_STEM := app_process
LOCAL_ADDRESS_SANITIZER := true

LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code

include $(BUILD_EXECUTABLE)

endif # ifeq($(TARGET_ARCH),arm)
+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@

namespace android {

void app_usage()
static void app_usage()
{
    fprintf(stderr,
        "Usage: app_process [java-options] cmd-dir start-class-name [options]\n");
+2 −0
Original line number Diff line number Diff line
@@ -12,4 +12,6 @@ LOCAL_MODULE:= btool
LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES)
LOCAL_MODULE_TAGS := optional

LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code

include $(BUILD_EXECUTABLE)
+5 −9
Original line number Diff line number Diff line
@@ -25,8 +25,7 @@ using namespace android;

#include <unistd.h>

int
usage(int argc, const char** argv)
static int usage(int /* argc */, const char** argv)
{
    const char* p = argv[0];

@@ -44,15 +43,13 @@ usage(int argc, const char** argv)
    return 1;
}

int
perform_full_backup()
static int perform_full_backup()
{
    printf("this would have written all of your data to stdout\n");
    return 0;
}

int
perform_list(const char* filename)
static int perform_list(const char* filename)
{
    int err;
    int fd;
@@ -95,14 +92,13 @@ perform_list(const char* filename)
    return 0;
}

int perform_print(const char* entityname, const char* filename)
static int perform_print(const char* entityname, const char* filename)
{
    printf("perform_print(%s, %s);", entityname, filename);
    return 0;
}

int
main(int argc, const char** argv)
int main(int argc, const char** argv)
{
    if (argc <= 1) {
        return perform_full_backup();
+11 −9
Original line number Diff line number Diff line
@@ -8,6 +8,8 @@ LOCAL_SRC_FILES:= \

LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES

LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code

LOCAL_C_INCLUDES += external/tinyalsa/include

LOCAL_SHARED_LIBRARIES := \
Loading