summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorDan Willemsen2017-11-29 20:06:11 -0600
committerDan Willemsen2017-11-29 23:37:28 -0600
commit528f144e779dfd18b550d9176aecf36e1130f449 (patch)
treef8b8faf502550eabda14c99bcaffd4f3d25a205d /base
parent70fda27eb2a72958636c8026be7cc72881bdff25 (diff)
downloadplatform-system-core-528f144e779dfd18b550d9176aecf36e1130f449.tar.gz
platform-system-core-528f144e779dfd18b550d9176aecf36e1130f449.tar.xz
platform-system-core-528f144e779dfd18b550d9176aecf36e1130f449.zip
Fix / suppress new unused warnings for mingw+clang
Bug: 69933068 Test: mmma system/core Change-Id: I089166a979d3d8c5ada38a7745d507b555048499
Diffstat (limited to 'base')
-rw-r--r--base/Android.bp1
-rw-r--r--base/logging_test.cpp2
-rw-r--r--base/utf8.cpp2
3 files changed, 4 insertions, 1 deletions
diff --git a/base/Android.bp b/base/Android.bp
index 7ff02a0ee..ad0edf4a9 100644
--- a/base/Android.bp
+++ b/base/Android.bp
@@ -129,6 +129,7 @@ cc_test {
129 }, 129 },
130 windows: { 130 windows: {
131 srcs: ["utf8_test.cpp"], 131 srcs: ["utf8_test.cpp"],
132 cflags: ["-Wno-unused-parameter"],
132 enabled: true, 133 enabled: true,
133 }, 134 },
134 }, 135 },
diff --git a/base/logging_test.cpp b/base/logging_test.cpp
index adb041b32..6f05d9b7f 100644
--- a/base/logging_test.cpp
+++ b/base/logging_test.cpp
@@ -192,6 +192,7 @@ TEST(logging, WOULD_LOG_VERBOSE_enabled) {
192#undef CHECK_WOULD_LOG_ENABLED 192#undef CHECK_WOULD_LOG_ENABLED
193 193
194 194
195#if !defined(_WIN32)
195static std::string make_log_pattern(android::base::LogSeverity severity, 196static std::string make_log_pattern(android::base::LogSeverity severity,
196 const char* message) { 197 const char* message) {
197 static const char log_characters[] = "VDIWEFF"; 198 static const char log_characters[] = "VDIWEFF";
@@ -203,6 +204,7 @@ static std::string make_log_pattern(android::base::LogSeverity severity,
203 "%c \\d+-\\d+ \\d+:\\d+:\\d+ \\s*\\d+ \\s*\\d+ %s:\\d+] %s", 204 "%c \\d+-\\d+ \\d+:\\d+:\\d+ \\s*\\d+ \\s*\\d+ %s:\\d+] %s",
204 log_char, basename(&holder[0]), message); 205 log_char, basename(&holder[0]), message);
205} 206}
207#endif
206 208
207static void CheckMessage(const CapturedStderr& cap, 209static void CheckMessage(const CapturedStderr& cap,
208 android::base::LogSeverity severity, const char* expected) { 210 android::base::LogSeverity severity, const char* expected) {
diff --git a/base/utf8.cpp b/base/utf8.cpp
index 5984fb06c..adb46d09c 100644
--- a/base/utf8.cpp
+++ b/base/utf8.cpp
@@ -195,7 +195,7 @@ FILE* fopen(const char* name, const char* mode) {
195 return _wfopen(name_utf16.c_str(), mode_utf16.c_str()); 195 return _wfopen(name_utf16.c_str(), mode_utf16.c_str());
196} 196}
197 197
198int mkdir(const char* name, mode_t mode) { 198int mkdir(const char* name, mode_t) {
199 std::wstring name_utf16; 199 std::wstring name_utf16;
200 if (!UTF8PathToWindowsLongPath(name, &name_utf16)) { 200 if (!UTF8PathToWindowsLongPath(name, &name_utf16)) {
201 return -1; 201 return -1;