diff options
| author | James Robinson <jamesr@chromium.org> | 2014-09-16 22:20:58 -0700 |
|---|---|---|
| committer | James Robinson <jamesr@chromium.org> | 2014-09-17 05:21:35 +0000 |
| commit | 2ed4d695d6cf2917fc0e52f767d629fbefa7a1f9 (patch) | |
| tree | 98118de0c2f3a65e2d6a387819404b041695ec73 /third_party | |
| parent | d3e622b0bb31f20c274bc9ad634b8ee7bae99ac1 (diff) | |
| download | chromium_src-2ed4d695d6cf2917fc0e52f767d629fbefa7a1f9.zip chromium_src-2ed4d695d6cf2917fc0e52f767d629fbefa7a1f9.tar.gz chromium_src-2ed4d695d6cf2917fc0e52f767d629fbefa7a1f9.tar.bz2 | |
GN: Get //chrome/* mostly working on android
This gets the //chrome subtree down to a fairly small number of build
errors on Android. Most of the changes are making features not enabled
on android like extensions and plugins properly guarded. This also adds
a few jni targets and fixes up some bitrotted bits.
R=brettw@chromium.org, cjhopman@chromium.org
Review URL: https://codereview.chromium.org/571863002
Cr-Commit-Position: refs/heads/master@{#295231}
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libaddressinput/BUILD.gn | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/third_party/libaddressinput/BUILD.gn b/third_party/libaddressinput/BUILD.gn index 136a16e..b906270 100644 --- a/third_party/libaddressinput/BUILD.gn +++ b/third_party/libaddressinput/BUILD.gn @@ -4,13 +4,6 @@ import("//tools/grit/grit_rule.gni") -# 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" ]) - libaddressinput_util_files = [ "src/cpp/src/address_data.cc", "src/cpp/src/address_field.cc", @@ -132,6 +125,16 @@ static_library("util") { ] } +if (!is_android) { + +# 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" ]) + + # This target provides more complicated functionality like pinging servers # for validation rules. # GYP version: third_party/libaddressinput/libaddressinput.gyp:libaddressinput @@ -199,3 +202,5 @@ test("libaddressinput_unittests") { "//testing/gtest", ] } + +} # !is_android |