Index: third_party/crashpad/crashpad/third_party/gtest/gmock.gyp |
diff --git a/third_party/crashpad/crashpad/third_party/gtest/gmock.gyp b/third_party/crashpad/crashpad/third_party/gtest/gmock.gyp |
index 466de6a9f751e46c42dba09c7650ce1c211af162..a6600708f808230f9c00450f31aecda86f30efed 100644 |
--- a/third_party/crashpad/crashpad/third_party/gtest/gmock.gyp |
+++ b/third_party/crashpad/crashpad/third_party/gtest/gmock.gyp |
@@ -104,7 +104,7 @@ |
], |
}, |
}], |
- ['OS=="linux"', { |
+ ['OS=="linux" or OS=="android"', { |
'cflags': [ |
'-Wno-inconsistent-missing-override', |
'-Wno-unknown-warning-option', |