Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(135)

Unified Diff: BUILD.gn

Issue 2410163003: Enable remoting_me2me_host_archive in official build (Closed)
Patch Set: Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: BUILD.gn
diff --git a/BUILD.gn b/BUILD.gn
index 93699f0c9b4acfe03fda0a63e682a514fc90748e..9b6b4dfb6dec4b64ffcd297fb7cc7e26ef4d6b23 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -122,8 +122,12 @@ if (is_win) {
} else {
deps += [ "//courgette(//build/toolchain/win:x64)" ]
}
- if (is_chrome_branded) {
+ }
+ if (is_chrome_branded) {
+ if (target_cpu == "x86") {
deps += [ "//remoting/host:remoting_host_installation" ]
+ } else {
+ deps += [ "//remoting/host:remoting_me2me_host_archive" ]
Dirk Pranke 2016/10/12 18:54:50 Should :remoting_host_installation just depend on
}
}
}
@@ -302,12 +306,12 @@ group("both_gn_and_gyp") {
"//mojo/edk/test:mojo_public_system_unittests",
"//net:net_perftests",
"//services/shell/public/cpp",
- "//third_party/angle/src/tests:angle_end2end_tests",
- "//third_party/angle/src/tests:angle_unittests",
"//third_party/WebKit/Source/platform:blink_platform_unittests",
"//third_party/WebKit/Source/platform/heap:blink_heap_unittests",
"//third_party/WebKit/Source/web:webkit_unit_tests",
"//third_party/WebKit/Source/wtf:wtf_unittests",
+ "//third_party/angle/src/tests:angle_end2end_tests",
+ "//third_party/angle/src/tests:angle_unittests",
"//third_party/catapult/telemetry:bitmaptools($host_toolchain)",
"//third_party/smhasher:pmurhash",
"//tools/imagediff($host_toolchain)",
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698