diff options
| author | agrieve <agrieve@chromium.org> | 2016-01-05 11:26:27 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-05 19:27:07 +0000 |
| commit | 97dd57df5affed43a82441b987c4504b72ac64c5 (patch) | |
| tree | 44f1f42154887988499048118b5865f7933870e5 | |
| parent | a553b0bba88371b73c1a76f0fc438133ae2022d0 (diff) | |
| download | chromium_src-97dd57df5affed43a82441b987c4504b72ac64c5.zip chromium_src-97dd57df5affed43a82441b987c4504b72ac64c5.tar.gz chromium_src-97dd57df5affed43a82441b987c4504b72ac64c5.tar.bz2 | |
GN: Don't compile battor_agent, imagediff, bitmaptools on Android
Came across this because battor_agent doesn't link without
--gc-sections.
I don't think there's a use for running these tools on-device.
BUG=159847
Review URL: https://codereview.chromium.org/1545963003
Cr-Commit-Position: refs/heads/master@{#367609}
| -rw-r--r-- | BUILD.gn | 5 | ||||
| -rw-r--r-- | device/serial/BUILD.gn | 3 | ||||
| -rw-r--r-- | tools/battor_agent/BUILD.gn | 3 |
3 files changed, 10 insertions, 1 deletions
@@ -196,7 +196,6 @@ group("both_gn_and_gyp") { "//third_party/mojo/src/mojo/edk/test:mojo_public_system_unittests", "//third_party/mojo/src/mojo/edk/test:mojo_public_utility_unittests", "//third_party/smhasher:pmurhash", - "//tools/battor_agent", "//tools/imagediff($host_toolchain)", "//tools/telemetry:bitmaptools($host_toolchain)", "//ui/display:display_unittests", @@ -224,6 +223,10 @@ group("both_gn_and_gyp") { } } + if (is_mac || is_win || is_linux) { + deps += [ "//tools/battor_agent" ] + } + deps += root_extra_deps if (enable_extensions) { diff --git a/device/serial/BUILD.gn b/device/serial/BUILD.gn index 474317e..ae6e00a 100644 --- a/device/serial/BUILD.gn +++ b/device/serial/BUILD.gn @@ -5,6 +5,9 @@ import("//build/config/features.gni") import("//mojo/public/tools/bindings/mojom.gni") +# Library works only on desktop platforms. +assert(is_win || is_linux || is_mac) + # GYP version: device/serial/serial.gyp:device_serial static_library("serial") { output_name = "device_serial" diff --git a/tools/battor_agent/BUILD.gn b/tools/battor_agent/BUILD.gn index 03c5594..07d3af5 100644 --- a/tools/battor_agent/BUILD.gn +++ b/tools/battor_agent/BUILD.gn @@ -4,6 +4,9 @@ import("//testing/test.gni") +# Works only on desktop platforms. +assert(is_win || is_linux || is_mac) + executable("battor_agent") { sources = [ "battor_agent_bin.cc", |