2 files changed, 23 insertions, 5 deletions
diff --git a/third_party/libaddressinput/BUILD.gn b/third_party/libaddressinput/BUILD.gn
index 0c92b5b..1307c71 100644
--- a/third_party/libaddressinput/BUILD.gn
+++ b/third_party/libaddressinput/BUILD.gn
@@ -24,6 +24,12 @@ libaddressinput_util_files = [
   "src/cpp/src/util/string_util.cc",
 ]
 
+config("no-newline-eof-warning") {
+  if (is_clang) {
+    cflags = [ "-Wno-newline-eof" ]
+  }
+}
+
 # GYP version: third_party/libaddressinput/libaddressinput.gyp:libaddressinput_strings
 grit("strings") {
   source = "//chrome/app/address_input_strings.grd"
@@ -85,6 +91,8 @@ grit("strings") {
     "address_input_strings_zh-CN.pak",
     "address_input_strings_zh-TW.pak",
   ]
+
+  configs = [ ":no-newline-eof-warning" ]
 }
 
 config("libaddressinput_config") {
@@ -109,7 +117,10 @@ static_library("util") {
   sources -= [ "src/cpp/src/util/json.cc" ]
 
   configs -= [ "//build/config/compiler:chromium_code" ]
-  configs += [ "//build/config/compiler:no_chromium_code" ]
+  configs += [
+    ":no-newline-eof-warning",
+    "//build/config/compiler:no_chromium_code",
+  ]
 
   public_configs = [ ":libaddressinput_config" ]
 
diff --git a/third_party/libexif/BUILD.gn b/third_party/libexif/BUILD.gn
index be8caf6..de9b2ef 100644
--- a/third_party/libexif/BUILD.gn
+++ b/third_party/libexif/BUILD.gn
@@ -4,10 +4,19 @@
 
 # Linux should use system libexif
 if (!is_linux || is_chromeos) {
-
   # TODO(thestig): Properly support building on Linux.
   config("libexif_config") {
     include_dirs = [ "sources" ]
+    if (is_clang) {
+      cflags = [
+        "-Wno-enum-conversion",
+        "-Wno-switch",
+        "-Wno-format",
+
+        # libexif uses fabs(int) to cast to float.
+        "-Wno-absolute-value",
+      ]
+    }
   }
 
   static_library("libexif") {
@@ -51,9 +60,7 @@ if (!is_linux || is_chromeos) {
 
       ldflags = [ "/DEF:" + rebase_path("libexif.def") ]
 
-      cflags = [
-        "/wd4018",  # size/unsigned mismatch
-      ]
+      cflags = [ "/wd4018" ]  # size/unsigned mismatch
 
       # TODO(GYP): Handle /analyze switch, when it will be used in GN.
     } else if (is_linux) {