diff options
| author | scottmg <scottmg@chromium.org> | 2014-12-02 23:28:00 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-12-03 07:29:20 +0000 |
| commit | 1c240d2719e764ed0108aa59ba35a6d99c00491a (patch) | |
| tree | f33b022e82cbca0f69637da64415fe5259496c89 /third_party/libaddressinput | |
| parent | d83fc265629d2a24078132b260c76192f3cc68f1 (diff) | |
| download | chromium_src-1c240d2719e764ed0108aa59ba35a6d99c00491a.zip chromium_src-1c240d2719e764ed0108aa59ba35a6d99c00491a.tar.gz chromium_src-1c240d2719e764ed0108aa59ba35a6d99c00491a.tar.bz2 | |
gn format //third_party
Uses gn binary at head.
No intended functionality change.
R=brettw@chromium.org
TBR=scherkus@chromium.org
BUG=348474
Review URL: https://codereview.chromium.org/779473002
Cr-Commit-Position: refs/heads/master@{#306567}
Diffstat (limited to 'third_party/libaddressinput')
| -rw-r--r-- | third_party/libaddressinput/BUILD.gn | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/third_party/libaddressinput/BUILD.gn b/third_party/libaddressinput/BUILD.gn index 8e65d69..99c2be2 100644 --- a/third_party/libaddressinput/BUILD.gn +++ b/third_party/libaddressinput/BUILD.gn @@ -105,9 +105,7 @@ static_library("util") { "chromium/addressinput_util.cc", "chromium/json.cc", ] - sources -= [ - "src/cpp/src/util/json.cc", - ] + sources -= [ "src/cpp/src/util/json.cc" ] configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] @@ -197,12 +195,10 @@ if (is_android) { } } else { # The list of files in libaddressinput.gypi. - gypi_values = exec_script( - "//build/gypi_to_gn.py", - [ rebase_path("src/cpp/libaddressinput.gypi") ], - "scope", - [ "src/cpp/libaddressinput.gypi" ]) - + gypi_values = exec_script("//build/gypi_to_gn.py", + [ rebase_path("src/cpp/libaddressinput.gypi") ], + "scope", + [ "src/cpp/libaddressinput.gypi" ]) # This target provides more complicated functionality like pinging servers # for validation rules. @@ -219,9 +215,7 @@ if (is_android) { "chromium/trie.cc", ] sources -= libaddressinput_util_files - sources -= [ - "src/cpp/src/util/string_compare.cc", - ] + sources -= [ "src/cpp/src/util/string_compare.cc" ] configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] @@ -239,8 +233,8 @@ if (is_android) { } test("libaddressinput_unittests") { - sources = rebase_path( - gypi_values.libaddressinput_test_files, ".", "src/cpp") + sources = + rebase_path(gypi_values.libaddressinput_test_files, ".", "src/cpp") sources += [ "chromium/addressinput_util_unittest.cc", "chromium/chrome_address_validator_unittest.cc", @@ -255,13 +249,9 @@ if (is_android) { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code" ] - defines = [ - "TEST_DATA_DIR=\"third_party/libaddressinput/src/testdata\"", - ] + defines = [ "TEST_DATA_DIR=\"third_party/libaddressinput/src/testdata\"" ] - include_dirs = [ - "src/cpp/src", - ] + include_dirs = [ "src/cpp/src" ] deps = [ ":libaddressinput", |