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

Commit 04b25bc3 authored by Dan Willemsen's avatar Dan Willemsen Committed by android-build-merger
Browse files

Merge "Fix / suppress new unused warnings for mingw+clang" am: f106bb6b am: 829ecaa8 

am: bfd61d6a

Change-Id: I916db5f7fa200f74c43c8e76c3f48c5c5ac131f5
parents de4cac40 bfd61d6a

base/Android.bp

+1 −0
Original line number Original line Diff line number Diff line
@@ -129,6 +129,7 @@ cc_test { 
        },

        },

        windows: {

        windows: {

            srcs: ["utf8_test.cpp"],

            srcs: ["utf8_test.cpp"],

            cflags: ["-Wno-unused-parameter"],

            enabled: true,

            enabled: true,

        },

        },

    },

    },

base/logging_test.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -192,6 +192,7 @@ TEST(logging, WOULD_LOG_VERBOSE_enabled) { 
#undef CHECK_WOULD_LOG_ENABLED

#undef CHECK_WOULD_LOG_ENABLED









#if !defined(_WIN32)

static std::string make_log_pattern(android::base::LogSeverity severity,

static std::string make_log_pattern(android::base::LogSeverity severity,

                                    const char* message) {

                                    const char* message) {

  static const char log_characters[] = "VDIWEFF";

  static const char log_characters[] = "VDIWEFF";
@@ -203,6 +204,7 @@ static std::string make_log_pattern(android::base::LogSeverity severity, 
      "%c \\d+-\\d+ \\d+:\\d+:\\d+ \\s*\\d+ \\s*\\d+ %s:\\d+] %s",

      "%c \\d+-\\d+ \\d+:\\d+:\\d+ \\s*\\d+ \\s*\\d+ %s:\\d+] %s",

      log_char, basename(&holder[0]), message);

      log_char, basename(&holder[0]), message);

}

}

#endif





static void CheckMessage(const CapturedStderr& cap,

static void CheckMessage(const CapturedStderr& cap,

                         android::base::LogSeverity severity, const char* expected) {

                         android::base::LogSeverity severity, const char* expected) {

base/utf8.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -195,7 +195,7 @@ FILE* fopen(const char* name, const char* mode) { 
  return _wfopen(name_utf16.c_str(), mode_utf16.c_str());

  return _wfopen(name_utf16.c_str(), mode_utf16.c_str());

}

}





int mkdir(const char* name, mode_t mode) {

int mkdir(const char* name, mode_t) {

  std::wstring name_utf16;

  std::wstring name_utf16;

  if (!UTF8PathToWindowsLongPath(name, &name_utf16)) {

  if (!UTF8PathToWindowsLongPath(name, &name_utf16)) {

    return -1;

    return -1;

fastboot/fs.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ using android::base::StringPrintf; 
using android::base::unique_fd;

using android::base::unique_fd;





#ifdef WIN32

#ifdef WIN32

static int exec_e2fs_cmd(const char* path, char* const argv[]) {

static int exec_e2fs_cmd(const char* /*path*/, char* const argv[]) {

    std::string cmd;

    std::string cmd;

    int i = 0;

    int i = 0;

    while (argv[i] != nullptr) {

    while (argv[i] != nullptr) {

libcutils/sockets_windows.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -85,6 +85,6 @@ ssize_t socket_send_buffers(cutils_socket_t sock, 
    return -1;

    return -1;

}

}





int android_get_control_socket(const char* name) {

int android_get_control_socket(const char*) {

    return -1;

    return -1;

}
 
}