diff options
author | cpu <cpu@chromium.org> | 2015-03-02 14:27:35 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-02 22:28:26 +0000 |
commit | defc80c0cd51186b467c3e59eabdbf54d25bde74 (patch) | |
tree | 32d1c8d66f7e9f9aa7d6383553c42972a1939853 /remoting/base | |
parent | c32b1cd854552259473c954c9204fe87426e540a (diff) | |
download | chromium_src-defc80c0cd51186b467c3e59eabdbf54d25bde74.zip chromium_src-defc80c0cd51186b467c3e59eabdbf54d25bde74.tar.gz chromium_src-defc80c0cd51186b467c3e59eabdbf54d25bde74.tar.bz2 |
Revert of Add remoting and PPAPI tests to GN build (patchset #6 id:100001 of https://codereview.chromium.org/961323004/)
Reason for revert:
broke windows GN builds as seen in
http://build.chromium.org/p/chromium.win/builders/Win8%20GN/builds/5206/steps/compile/logs/stdio
Original issue's description:
> Add remoting and PPAPI tests to GN build
>
> Reland of https://codereview.chromium.org/965633002/
>
> TBR=dpranke
>
> Committed: https://crrev.com/66c53eef76f7dff97b1bc76d51740c3a9c07844f
> Cr-Commit-Position: refs/heads/master@{#318756}
TBR=dpranke@chromium.org,brettw@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/968243004
Cr-Commit-Position: refs/heads/master@{#318772}
Diffstat (limited to 'remoting/base')
-rw-r--r-- | remoting/base/BUILD.gn | 48 |
1 files changed, 9 insertions, 39 deletions
diff --git a/remoting/base/BUILD.gn b/remoting/base/BUILD.gn index 90d4208..5080599 100644 --- a/remoting/base/BUILD.gn +++ b/remoting/base/BUILD.gn @@ -2,12 +2,13 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -import("//remoting/remoting_srcs.gni") +static_library("base") { + gypi_values = exec_script("//build/gypi_to_gn.py", + [ rebase_path("../remoting_srcs.gypi") ], + "scope", + [ "../remoting_srcs.gypi" ]) -source_set("base") { - sources = rebase_path(remoting_srcs_gypi_values.remoting_base_sources, - ".", - "//remoting") + sources = rebase_path(gypi_values.remoting_base_sources, ".", "//remoting") configs += [ "//build/config/compiler:wexit_time_destructors" ] @@ -24,41 +25,10 @@ source_set("base") { "//remoting/resources", "//third_party/libvpx", "//third_party/libyuv", + "//third_party/opus", "//third_party/webrtc/modules/desktop_capture", "//ui/base", - ] -} - -source_set("unit_tests") { - testonly = true - - sources = [ - "auto_thread_task_runner_unittest.cc", - "auto_thread_unittest.cc", - "breakpad_win_unittest.cc", - "buffered_socket_writer_unittest.cc", - "capabilities_unittest.cc", - "compound_buffer_unittest.cc", - "rate_counter_unittest.cc", - "rsa_key_pair_unittest.cc", - "run_all_unittests.cc", - "running_average_unittest.cc", - "test_rsa_key_pair.h", - "typed_buffer_unittest.cc", - "util_unittest.cc", - ] - - if (is_win || is_mac || is_chromeos) { - sources += [ "resources_unittest.cc" ] - } - - deps = [ - ":base", - "//base", - "//net:test_support", - "//testing/gmock", - "//testing/gtest", - "//third_party/libyuv", - "//third_party/webrtc/modules/desktop_capture", + "//ui/gfx", + "//ui/gfx/geometry", ] } |