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

Unified Diff: build/gn_migration.gypi

Issue 1039083004: Add remaining remoting targets for the GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@content_browsertests
Patch Set: disable remoting_host on mac, win Created 5 years, 9 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 | « build/config/linux/gtk/BUILD.gn ('k') | remoting/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/gn_migration.gypi
diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi
index 136cd1ac0b6f85179b0c3afb2615a4ef779f72cc..53e5a02bf9e9ff7f4a23e207001af8a732190e8c 100644
--- a/build/gn_migration.gypi
+++ b/build/gn_migration.gypi
@@ -186,6 +186,11 @@
['chromeos== 1 or use_ash==1', {
'dependencies': [
'../components/components.gyp:session_manager_component',
+ ]
+ }],
+ ['disable_nacl==0 and disable_nacl_untrusted==0', {
+ 'dependencies': [
+ '../remoting/remoting.gyp:remoting_key_tester',
],
}],
['disable_nacl==0 and disable_nacl_untrusted==0', {
@@ -206,6 +211,13 @@
}],
['remoting==1', {
'dependencies': [
+ '../remoting/remoting.gyp:remoting_host',
+ '../remoting/remoting.gyp:remoting_it2me_native_messaging_host',
+ '../remoting/remoting.gyp:remoting_me2me_native_messaging_host',
+ '../remoting/remoting.gyp:remoting_me2me_host',
+ '../remoting/remoting.gyp:remoting_native_messaging_manifests',
+ '../remoting/remoting.gyp:remoting_perftests',
+ '../remoting/remoting.gyp:remoting_start_host',
'../remoting/remoting.gyp:remoting_unittests',
],
}],
@@ -446,14 +458,7 @@
'conditions': [
['remoting==1', {
'dependencies': [
- '../remoting/app_remoting_webapp.gyp:ar_sample_app',
- '../remoting/remoting.gyp:remoting_host',
- '../remoting/remoting.gyp:remoting_it2me_native_messaging_host',
- '../remoting/remoting.gyp:remoting_me2me_host',
- '../remoting/remoting.gyp:remoting_me2me_native_messaging_host',
- '../remoting/remoting.gyp:remoting_native_messaging_manifests',
- '../remoting/remoting.gyp:remoting_perftests',
- '../remoting/remoting.gyp:remoting_start_host',
+ '../remoting/app_remoting_webapp.gyp:ar_sample_app', # crbug.com/471916
],
'conditions': [
['disable_nacl==0 and disable_nacl_untrusted==0', {
« no previous file with comments | « build/config/linux/gtk/BUILD.gn ('k') | remoting/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698