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

Unified Diff: remoting/remoting_host.gypi

Issue 1414583004: Fix gyp/gn with configuration_policy=0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Forgot GN for android_webview Created 5 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 | « components/BUILD.gn ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/remoting_host.gypi
diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi
index de2a5d962885e806b37320049c444408210276f8..6dc903f3b2a8e89308b90e607c2a905fac42a2b9 100644
--- a/remoting/remoting_host.gypi
+++ b/remoting/remoting_host.gypi
@@ -41,8 +41,6 @@
'remoting_protocol',
'remoting_resources',
'../base/base.gyp:base_i18n',
- '../components/components.gyp:policy',
- '../components/components.gyp:policy_component_common',
'../crypto/crypto.gyp:crypto',
'../google_apis/google_apis.gyp:google_apis',
'../ipc/ipc.gyp:ipc',
@@ -57,6 +55,12 @@
'<@(remoting_host_sources)',
],
'conditions': [
+ ['configuration_policy==1', {
Sergey Ulanov 2015/10/20 16:16:21 It doesn't make sense to compile remoting_host tar
+ 'dependencies': [
+ '../components/components.gyp:policy',
+ '../components/components.gyp:policy_component_common',
+ ],
+ }],
['OS=="linux"', {
'conditions': [
['use_x11==1', {
@@ -379,7 +383,6 @@
'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
'../base/base.gyp:base_i18n',
- '../components/components.gyp:policy',
'../net/net.gyp:net',
'remoting_base',
'remoting_host',
@@ -393,6 +396,13 @@
'sources': [
'<@(remoting_it2me_host_static_sources)',
],
+ 'conditions': [
+ ['configuration_policy==1', {
+ 'dependencies': [
+ '../components/components.gyp:policy',
+ ],
+ }],
+ ],
}, # end of target 'remoting_it2me_host_static'
], # end of 'targets'
}], # 'enable_remoting_host==1'
@@ -406,8 +416,6 @@
'dependencies': [
'../base/base.gyp:base',
'../base/base.gyp:base_i18n',
- '../components/components.gyp:policy',
- '../components/components.gyp:policy_component_common',
'../net/net.gyp:net',
'../third_party/webrtc/modules/modules.gyp:desktop_capture',
'remoting_base',
@@ -430,6 +438,12 @@
'host/remoting_me2me_host.cc',
],
'conditions': [
+ ['configuration_policy==1', {
+ 'dependencies': [
+ '../components/components.gyp:policy',
+ '../components/components.gyp:policy_component_common',
+ ],
+ }],
['OS=="linux"', {
'link_settings': {
'libraries': [
« no previous file with comments | « components/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698