summaryrefslogtreecommitdiffstats
path: root/google_apis
diff options
context:
space:
mode:
authorbrettw <brettw@chromium.org>2015-04-24 15:56:49 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-24 22:58:02 +0000
commit45b7e2502461503f255d612e2cf46eec7a2a8f60 (patch)
treeec587ea35d56c540c57d9b9e097bd906caf771e4 /google_apis
parent3f6c899c85e7849970246fc8bf103b5f8f2a421a (diff)
downloadchromium_src-45b7e2502461503f255d612e2cf46eec7a2a8f60.zip
chromium_src-45b7e2502461503f255d612e2cf46eec7a2a8f60.tar.gz
chromium_src-45b7e2502461503f255d612e2cf46eec7a2a8f60.tar.bz2
Windows GN component build fixes: gpu, gcm
TBR=dpranke@chromium.org CQ_EXTRA_TRYBOTS=tryserver.chromium.linux:android_chromium_gn_compile_dbg,android_chromium_gn_compile_rel;tryserver.chromium.win:win8_chromium_gn_rel,win8_chromium_gn_dbg;tryserver.chromium.mac:mac_chromium_gn_rel,mac_chromium_gn_dbg Review URL: https://codereview.chromium.org/1051763008 Cr-Commit-Position: refs/heads/master@{#326918}
Diffstat (limited to 'google_apis')
-rw-r--r--google_apis/gcm/BUILD.gn10
1 files changed, 6 insertions, 4 deletions
diff --git a/google_apis/gcm/BUILD.gn b/google_apis/gcm/BUILD.gn
index ff96ea8..83aa067 100644
--- a/google_apis/gcm/BUILD.gn
+++ b/google_apis/gcm/BUILD.gn
@@ -59,7 +59,8 @@ component("gcm") {
}
proto_library("proto") {
- visibility = [ ":*" ]
+ # This is part of the gcm component.
+ visibility = [ ":gcm" ]
sources = [
"protocol/android_checkin.proto",
"protocol/checkin.proto",
@@ -71,7 +72,7 @@ proto_library("proto") {
defines = [ "GCM_IMPLEMENTATION" ]
}
-static_library("test_support") {
+source_set("test_support") {
testonly = true
sources = [
"base/fake_encryptor.cc",
@@ -103,11 +104,11 @@ executable("mcs_probe") {
deps = [
":gcm",
- ":proto",
":test_support",
"//base",
"//net",
"//net:test_support",
+ "//third_party/protobuf:protobuf_lite",
]
}
@@ -129,12 +130,13 @@ test("gcm_unit_tests") {
]
deps = [
- ":proto",
+ ":gcm",
":test_support",
"//base",
"//base/test:run_all_unittests",
"//net",
"//net:test_support",
"//testing/gtest",
+ "//third_party/protobuf:protobuf_lite",
]
}