diff options
author | maniscalco <maniscalco@chromium.org> | 2015-04-16 16:57:45 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-04-16 23:59:01 +0000 |
commit | 76302d920e57d6d0c368d827a78817aecea541ba (patch) | |
tree | ae6159a8eab38678b1247fdbb0415c51f834b46d /remoting/BUILD.gn | |
parent | da605e17d193b798562d81c96069fbeff3014631 (diff) | |
download | chromium_src-76302d920e57d6d0c368d827a78817aecea541ba.zip chromium_src-76302d920e57d6d0c368d827a78817aecea541ba.tar.gz chromium_src-76302d920e57d6d0c368d827a78817aecea541ba.tar.bz2 |
Revert of [Chromoting] Enable remoting webapp main.html GN build. (patchset #5 id:80001 of https://codereview.chromium.org/1082083005/)
Reason for revert:
Suspected of breaking the build. For details, see https://code.google.com/p/chromium/issues/detail?id=477869
Original issue's description:
> [Chromoting] Enable remoting webapp main.html GN build.
>
> The previous remoting webapp GN build files were not enabled and at
> least 6 months out of date. This cl fixes the problem by bringing
> the build rules up to date and enables the webapp build.
>
> It also starts to move all the remoting-specific build rules into
> the remoting dir rather than having them in the main build.gn file.
>
> BUG=
>
> Committed: https://crrev.com/62ee8a9cfebbc8bdc037aaa3b37ebfbb45e02472
> Cr-Commit-Position: refs/heads/master@{#325551}
TBR=dpranke@chromium.org,garykac@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=
Review URL: https://codereview.chromium.org/1090023004
Cr-Commit-Position: refs/heads/master@{#325556}
Diffstat (limited to 'remoting/BUILD.gn')
-rw-r--r-- | remoting/BUILD.gn | 59 |
1 files changed, 1 insertions, 58 deletions
diff --git a/remoting/BUILD.gn b/remoting/BUILD.gn index e65a03f..36211d7 100644 --- a/remoting/BUILD.gn +++ b/remoting/BUILD.gn @@ -5,7 +5,7 @@ import("//build/config/features.gni") import("//build/config/ui.gni") import("//remoting/remoting_version.gni") -import("//remoting/remoting_enable.gni") +import("//remoting/remoting_host.gni") import("//testing/test.gni") # Various remoting targets need this version definition. @@ -13,63 +13,6 @@ config("version") { defines = [ "VERSION=$version_full" ] } -group("remoting_all") { - testonly = true - - deps = [ - #"//remoting:remoting_browser_test_resources", - "//remoting:remoting_unittests", - - #"//remoting:remoting_webapp", - "//remoting/webapp:html", - - #"//remoting:remoting_webapp_unittests", - #"//app_remoting_test.gyp:ar_sample_test_driver", - #"//app_remoting_webapp.gyp:ar_sample_app", - ] - - if (is_win) { - deps += [ - #"//remoting:remoting_breakpad_tester", - #"//remoting:remoting_console", - #"//remoting:remoting_desktop", - #"//remoting:remoting_host_installation", - ] - } - - if (is_android) { - deps += [ - #"//remoting:remoting_apk", - #"//remoting:remoting_test_apk", - #"//remoting:remoting_unittests_apk", - ] - } - - if (enable_remoting_host) { - deps += [ - "//remoting:remoting_perftests", - "//remoting/host", - "//remoting/host:remoting_start_host", - "//remoting/host/it2me:remote_assistance_host", - - #"//remoting:remoting_it2me_native_messaging_host", - #"//remoting:remoting_native_messaging_manifests", - ] - } - - if (enable_me2me_host) { - deps += [ - "//remoting/host:remoting_me2me_host", - #"//remoting/host:remoting_me2me_host_archive", - ] - } - - # TODO(GYP) Depends on crbug.com/471924 being fixed for PNaCl. - if (enable_nacl) { - deps += [ "//remoting:remoting_key_tester" ] - } -} - # GYP version: remoting/remoting_test.gypi:remoting_test_common source_set("test_support") { testonly = true |