| Index: third_party/libaddressinput/BUILD.gn
|
| diff --git a/third_party/libaddressinput/BUILD.gn b/third_party/libaddressinput/BUILD.gn
|
| index 69c9b80420bdfec7646a029cdf4fe09c11844b46..dadb6c06b732058592282a92cd328a2751ca3b45 100644
|
| --- a/third_party/libaddressinput/BUILD.gn
|
| +++ b/third_party/libaddressinput/BUILD.gn
|
| @@ -6,9 +6,14 @@ import("//testing/test.gni")
|
| import("//build/config/locales.gni")
|
| import("//tools/grit/grit_rule.gni")
|
|
|
| -config("no-newline-eof-warning") {
|
| +config("internal_config") {
|
| if (is_clang) {
|
| - cflags = [ "-Wno-newline-eof" ]
|
| + cflags = [
|
| + "-Wno-newline-eof",
|
| +
|
| + # md5.cc uses "register". TODO(thakis): Fix.
|
| + "-Wno-deprecated-register",
|
| + ]
|
| }
|
| }
|
|
|
| @@ -26,7 +31,7 @@ grit("strings") {
|
| outputs += [ "address_input_strings_$locale.pak" ]
|
| }
|
|
|
| - configs = [ ":no-newline-eof-warning" ]
|
| + configs = [ ":internal_config" ]
|
| }
|
|
|
| config("libaddressinput_config") {
|
| @@ -64,7 +69,7 @@ static_library("util") {
|
|
|
| configs -= [ "//build/config/compiler:chromium_code" ]
|
| configs += [
|
| - ":no-newline-eof-warning",
|
| + ":internal_config",
|
| "//build/config/compiler:no_chromium_code",
|
| ]
|
|
|
| @@ -118,7 +123,10 @@ static_library("libaddressinput") {
|
| ]
|
|
|
| configs -= [ "//build/config/compiler:chromium_code" ]
|
| - configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + configs += [
|
| + ":internal_config",
|
| + "//build/config/compiler:no_chromium_code",
|
| + ]
|
|
|
| public_configs = [ ":libaddressinput_config" ]
|
|
|
| @@ -144,7 +152,10 @@ source_set("test_support") {
|
| ]
|
|
|
| configs -= [ "//build/config/compiler:chromium_code" ]
|
| - configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + configs += [
|
| + ":internal_config",
|
| + "//build/config/compiler:no_chromium_code",
|
| + ]
|
|
|
| defines = [ "TEST_DATA_DIR=\"src/third_party/libaddressinput/src/testdata\"" ]
|
|
|
| @@ -211,7 +222,10 @@ test("libaddressinput_unittests") {
|
| }
|
|
|
| configs -= [ "//build/config/compiler:chromium_code" ]
|
| - configs += [ "//build/config/compiler:no_chromium_code" ]
|
| + configs += [
|
| + ":internal_config",
|
| + "//build/config/compiler:no_chromium_code",
|
| + ]
|
|
|
| include_dirs = [ "src/cpp/src" ]
|
|
|
|
|