summaryrefslogtreecommitdiffstats
path: root/chromeos/BUILD.gn
diff options
context:
space:
mode:
authoryosin <yosin@chromium.org>2015-08-22 05:05:45 -0700
committerCommit bot <commit-bot@chromium.org>2015-08-22 12:06:31 +0000
commit1dc9aa14380b7c6c77d80354b86f55ede462766e (patch)
tree882e6d1e47ae4aeaf2c7d93aa2f276d2e955a21c /chromeos/BUILD.gn
parent027a930a4f456a173b5c01d8537185187698caeb (diff)
downloadchromium_src-1dc9aa14380b7c6c77d80354b86f55ede462766e.zip
chromium_src-1dc9aa14380b7c6c77d80354b86f55ede462766e.tar.gz
chromium_src-1dc9aa14380b7c6c77d80354b86f55ede462766e.tar.bz2
Revert of Add more components_unittests to GN build (patchset #5 id:80001 of https://codereview.chromium.org/1303703004/ )
Reason for revert: Compilation error in storage_monitor_win_unittest.cc. GYP build may not compile this file. FAILED: ninja -t msvc -e environment.x64 -- E:\b\build\goma/gomacc.exe "E:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64/cl.exe" /nologo /showIncludes /FC @obj/components/storage_monitor/unit_tests/storage_monitor_win_unittest.obj.rsp /c ../../components/storage_monitor/storage_monitor_win_unittest.cc /Foobj/components/storage_monitor/unit_tests/storage_monitor_win_unittest.obj /Fdobj/components/storage_monitor/unit_tests_cc.pdb e:\b\build\slave\win_x64_gn__dbg_\build\src\components\storage_monitor\storage_monitor_win_unittest.cc(218) : error C2220: warning treated as error - no 'object' file generated e:\b\build\slave\win_x64_gn__dbg_\build\src\components\storage_monitor\storage_monitor_win_unittest.cc(218) : warning C4267: '=' : conversion from 'size_t' to 'DWORD', possible loss of data e:\b\build\slave\win_x64_gn__dbg_\build\src\components\storage_monitor\storage_monitor_win_unittest.cc(298) : warning C4267: 'initializing' : conversion from 'size_t' to 'int', possible loss of data ninja: build stopped: subcommand failed. Original issue's description: > Add more components_unittests to GN build > > This adds tests for: url matcher, precache, sync driver, serialization, proxy config, leveldb proto, error page, storage monitor, search provider logos, translate, json schema, guest view, dom distiller, network hints. > > CQ_EXTRA_TRYBOTS=tryserver.chromium.mac:mac_chromium_gn_rel > > Committed: https://crrev.com/c76a816074e6504b0b4b3420529928057d11b50b > Cr-Commit-Position: refs/heads/master@{#344974} TBR=dpranke@chromium.org,brettw@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1313463002 Cr-Commit-Position: refs/heads/master@{#344976}
Diffstat (limited to 'chromeos/BUILD.gn')
-rw-r--r--chromeos/BUILD.gn6
1 files changed, 3 insertions, 3 deletions
diff --git a/chromeos/BUILD.gn b/chromeos/BUILD.gn
index 5b9a574..ea0a9d0 100644
--- a/chromeos/BUILD.gn
+++ b/chromeos/BUILD.gn
@@ -43,15 +43,15 @@ component("chromeos") {
defines = [ "CHROMEOS_IMPLEMENTATION" ]
}
-source_set("test_support") {
+static_library("test_support") {
testonly = true
configs += [ "//build/config/linux:dbus" ]
- public_deps = [
+ deps = [
+ "//testing/gmock",
":chromeos",
":cryptohome_proto",
":power_manager_proto",
":test_support_without_gmock",
- "//testing/gmock",
]
sources = [
"attestation/mock_attestation_flow.cc",