Skip to content

GitLab

T
tangled
Commit 9fb75ed8 authored by garykac's avatar garykac Committed by Commit bot
Browse files
Options

[Chromoting] Remove wildcard ('*') from remoting_all target. 

Support for the wildcard is going away in GN, so this helps prepare for the transition away from GYP.

This cl adds dummy targets so that that logic for when the proper targets should be build can be kept in the platform-specific files.

Some of the conditions in the host gyp files needed to be restructured so that the dummy targets would be defined only when necessary.  The updated conditions caused a lot of lines to be re-indented, but the target definitions are the same (except for the new dummy targets).

BUG=

Review URL: https://codereview.chromium.org/896743004

Cr-Commit-Position: refs/heads/master@{#315150}
parent 30114511
Show whitespace changes
Inline Side-by-side
Showing with 939 additions and 844 deletions
remoting/remoting_all.gyp
View file @ 9fb75ed8
...@@ -3,14 +3,76 @@ ...@@ -3,14 +3,76 @@
# found in the LICENSE file. # found in the LICENSE file.
{ {
'includes': [
'remoting_enable.gypi',
],
'targets': [ 'targets': [
{ {
'target_name': 'remoting_all', 'target_name': 'remoting_all',
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
'../remoting/remoting.gyp:*', '../remoting/remoting.gyp:remoting_base',
'../remoting/app_remoting_webapp.gyp:*', '../remoting/remoting.gyp:remoting_breakpad',
'../remoting/remoting.gyp:remoting_browser_test_resources',
'../remoting/remoting.gyp:remoting_client',
'../remoting/remoting.gyp:remoting_client_plugin',
'../remoting/remoting.gyp:remoting_protocol',
'../remoting/remoting.gyp:remoting_test_common',
'../remoting/remoting.gyp:remoting_unittests',
'../remoting/remoting.gyp:remoting_resources',
'../remoting/remoting.gyp:remoting_webapp',
'../remoting/remoting.gyp:remoting_webapp_html',
'../remoting/remoting.gyp:remoting_webapp_unittest',
'../remoting/app_remoting_webapp.gyp:ar_sample_app',
],
'conditions' : [
['OS=="win"', {
'dependencies': [
'../remoting/remoting.gyp:remoting_breakpad_tester',
'../remoting/remoting.gyp:remoting_console',
'../remoting/remoting.gyp:remoting_core',
'../remoting/remoting.gyp:remoting_desktop',
'../remoting/remoting.gyp:remoting_host_installation',
'../remoting/remoting.gyp:remoting_windows_resources',
],
}],
['OS=="android"', {
'dependencies': [
'../remoting/remoting.gyp:remoting_android_client_java',
'../remoting/remoting.gyp:remoting_android_resources',
'../remoting/remoting.gyp:remoting_apk',
'../remoting/remoting.gyp:remoting_apk_manifest',
'../remoting/remoting.gyp:remoting_client_jni',
'../remoting/remoting.gyp:remoting_jni_headers',
'../remoting/remoting.gyp:remoting_test_apk',
'../remoting/remoting.gyp:remoting_unittests_apk',
], ],
}],
['enable_remoting_host==1', {
'dependencies': [
'../remoting/remoting.gyp:remoting_infoplist_strings',
'../remoting/remoting.gyp:remoting_it2me_host_static',
'../remoting/remoting.gyp:remoting_it2me_native_messaging_host',
'../remoting/remoting.gyp:remoting_host',
'../remoting/remoting.gyp:remoting_host_setup_base',
'../remoting/remoting.gyp:remoting_native_messaging_base',
'../remoting/remoting.gyp:remoting_native_messaging_manifests',
'../remoting/remoting.gyp:remoting_perftests',
'../remoting/remoting.gyp:remoting_start_host',
],
}],
['enable_me2me_host==1', {
'dependencies': [
'../remoting/remoting.gyp:remoting_me2me_host',
'../remoting/remoting.gyp:remoting_me2me_host_archive',
'../remoting/remoting.gyp:remoting_me2me_host_static',
'../remoting/remoting.gyp:remoting_me2me_native_messaging_host',
],
}],
],
}, # end of target 'remoting_all' }, # end of target 'remoting_all'
], # end of targets ], # end of targets
} }
remoting/remoting_enable.gypi 0 → 100644
View file @ 9fb75ed8
# Copyright 2015 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
{
'variables': {
'enable_remoting_host%': 0,
'enable_me2me_host%': 0,
'conditions': [
['OS=="win" or OS=="mac"', {
'enable_remoting_host': 1,
'enable_me2me_host': 1,
}],
['OS=="linux" and chromeos==0 and use_x11==1', {
'enable_remoting_host': 1,
'enable_me2me_host': 1,
}],
['OS=="linux" and chromeos==1', {
'enable_remoting_host': 1,
}],
], # end of conditions
}, # end of variables
}
remoting/remoting_host.gypi
View file @ 9fb75ed8
...@@ -4,32 +4,26 @@ ...@@ -4,32 +4,26 @@
{ {
'includes': [ 'includes': [
'remoting_host_linux.gypi', 'remoting_enable.gypi',
'remoting_host_mac.gypi',
'remoting_host_win.gypi',
], ],
'variables': {
'conditions': [ 'conditions': [
# Remoting host is supported only on Windows, OSX and Linux (with X11). ['OS=="mac"', {
['OS=="win" or OS=="mac" or (OS=="linux" and use_x11==1)', { 'includes': [
'enable_me2me_host': 1, 'remoting_host_mac.gypi',
'enable_it2me_host': 1, ],
'enable_remoting_host': 1,
}, {
'enable_me2me_host': 0,
'enable_it2me_host': 0,
'enable_remoting_host': 0,
}], }],
['chromeos==1', { ['OS=="win"', {
'enable_remoting_host': 1, 'includes': [
'enable_me2me_host': 0, 'remoting_host_win.gypi',
'enable_it2me_host': 1, ],
}], }],
['OS=="linux"', {
'includes': [
'remoting_host_linux.gypi',
], ],
}, }],
'conditions': [
['enable_remoting_host==1', { ['enable_remoting_host==1', {
'targets': [ 'targets': [
{ {
...@@ -393,6 +387,28 @@ ...@@ -393,6 +387,28 @@
]}, ]},
], ],
}, # end of target 'remoting_infoplist_strings' }, # end of target 'remoting_infoplist_strings'
{
# GN version: //remoting/host/it2me:common
'target_name': 'remoting_it2me_host_static',
'type': 'static_library',
'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
'../base/base.gyp:base_i18n',
'../components/components.gyp:policy',
'../net/net.gyp:net',
'remoting_base',
'remoting_host',
'remoting_infoplist_strings',
'remoting_protocol',
'remoting_resources',
],
'defines': [
'VERSION=<(version_full)',
],
'sources': [
'<@(remoting_it2me_host_static_sources)',
],
}, # end of target 'remoting_it2me_host_static'
], # end of 'targets' ], # end of 'targets'
}], # 'enable_remoting_host==1' }], # 'enable_remoting_host==1'
...@@ -434,33 +450,6 @@ ...@@ -434,33 +450,6 @@
] # end of targets ] # end of targets
}], # end of enable_me2me_host==1 }], # end of enable_me2me_host==1
['enable_it2me_host==1', {
'targets': [
{
# GN version: //remoting/host/it2me:common
'target_name': 'remoting_it2me_host_static',
'type': 'static_library',
'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
'../base/base.gyp:base_i18n',
'../components/components.gyp:policy',
'../net/net.gyp:net',
'remoting_base',
'remoting_host',
'remoting_infoplist_strings',
'remoting_protocol',
'remoting_resources',
],
'defines': [
'VERSION=<(version_full)',
],
'sources': [
'<@(remoting_it2me_host_static_sources)',
],
}, # end of target 'remoting_it2me_host_static'
] # end of targets
}], # end of 'enable_it2me_host==1'
['OS!="win" and enable_me2me_host==1', { ['OS!="win" and enable_me2me_host==1', {
'targets': [ 'targets': [
{ {
...@@ -642,7 +631,9 @@ ...@@ -642,7 +631,9 @@
], # targets ], # targets
}], # end of OS!="win" and enable_me2me_host==1 }], # end of OS!="win" and enable_me2me_host==1
['OS!="win" and enable_it2me_host==1 and chromeos==0', { ['OS!="win" and enable_remoting_host==1', {
'conditions': [
['chromeos==0', {
'targets': [ 'targets': [
{ {
'target_name': 'remoting_it2me_native_messaging_host', 'target_name': 'remoting_it2me_native_messaging_host',
...@@ -736,10 +727,19 @@ ...@@ -736,10 +727,19 @@
}], # mac_breakpad==1 }], # mac_breakpad==1
], # conditions ], # conditions
}], # OS=mac }], # OS=mac
], ], # end of conditions
}, # end of target 'remoting_it2me_native_messaging_host' }, # end of target 'remoting_it2me_native_messaging_host'
], # end of 'targets' ], # targets
}], # # end of OS!="win" and enable_it2me_host==1 }, { # chromeos==0
'targets': [
{
# Dummy target for chromeos==1
'target_name': 'remoting_it2me_native_messaging_host',
'type': 'executable',
},
], # targets
}], # end of chromeos==0
], # end of conditions
}], # end of OS!="win" and enable_remoting_host==1
], # end of 'conditions' ], # end of 'conditions'
} }
remoting/remoting_host_linux.gypi
View file @ 9fb75ed8
...@@ -3,8 +3,6 @@ ...@@ -3,8 +3,6 @@
# found in the LICENSE file. # found in the LICENSE file.
{ {
'conditions': [
['OS=="linux" and ( (branding=="Chrome" and enable_remoting_host==1 and chromeos==0) or (archive_chromoting_tests==1) )', {
'variables': { 'variables': {
'build_deb_script': 'host/installer/linux/build-deb.sh', 'build_deb_script': 'host/installer/linux/build-deb.sh',
'deb_filename': 'host/installer/<!(["<(build_deb_script)", "-p", "-s", "<(DEPTH)"])', 'deb_filename': 'host/installer/<!(["<(build_deb_script)", "-p", "-s", "<(DEPTH)"])',
...@@ -17,6 +15,10 @@ ...@@ -17,6 +15,10 @@
'<(PRODUCT_DIR)/remote_assistance_host.debug', '<(PRODUCT_DIR)/remote_assistance_host.debug',
] ]
}, },
'conditions': [
['(branding=="Chrome" and enable_remoting_host==1 and chromeos==0) or (archive_chromoting_tests==1)', {
'targets': [ 'targets': [
{ {
# Store the installer package(s) into a zip file so there is a # Store the installer package(s) into a zip file so there is a
...@@ -40,8 +42,7 @@ ...@@ -40,8 +42,7 @@
'action': [ 'zip', '-j', '-0', '<@(_outputs)', '<@(_inputs)' ], 'action': [ 'zip', '-j', '-0', '<@(_outputs)', '<@(_inputs)' ],
}, },
], ],
}, }, {
{
'target_name': 'remoting_me2me_host_deb_installer', 'target_name': 'remoting_me2me_host_deb_installer',
'type': 'none', 'type': 'none',
'dependencies': [ 'dependencies': [
...@@ -75,10 +76,18 @@ ...@@ -75,10 +76,18 @@
}, },
], ],
}, },
], ], # end of 'targets'
}], # OS=="linux" and branding=="Chrome" }, {
# Dummy targets.
'targets': [
{
'target_name': 'remoting_me2me_host_archive',
'type': 'none',
},
], # end of 'targets'
}], # branding=="Chrome"
['OS=="linux" and enable_remoting_host==1', { ['enable_remoting_host==1', {
'targets': [ 'targets': [
# Linux breakpad processing # Linux breakpad processing
# The following target is disabled temporarily because it was failing # The following target is disabled temporarily because it was failing
...@@ -117,7 +126,7 @@ ...@@ -117,7 +126,7 @@
# ], # end of 'conditions' # ], # end of 'conditions'
# }, # end of target 'remoting_linux_symbols' # }, # end of target 'remoting_linux_symbols'
], # end of 'targets' ], # end of 'targets'
}], # 'OS=="linux"' }], # 'enable_remoting_host==1'
], # end of 'conditions' ], # end of 'conditions'
} }
remoting/remoting_host_mac.gypi
View file @ 9fb75ed8
...@@ -25,8 +25,6 @@ ...@@ -25,8 +25,6 @@
], ],
}, },
'conditions': [
['OS=="mac"', {
'targets': [ 'targets': [
{ {
'target_name': 'remoting_host_uninstaller', 'target_name': 'remoting_host_uninstaller',
...@@ -255,7 +253,5 @@ ...@@ -255,7 +253,5 @@
], # conditions ], # conditions
}, # end of target 'remoting_host_prefpane' }, # end of target 'remoting_host_prefpane'
], # end of 'targets' ], # end of 'targets'
}], # 'OS=="mac"'
], # end of 'conditions'
} }
remoting/remoting_host_win.gypi
View file @ 9fb75ed8
...@@ -11,10 +11,8 @@ ...@@ -11,10 +11,8 @@
'host/installer/win/chromoting.wxs', 'host/installer/win/chromoting.wxs',
'host/installer/win/parameters.json', 'host/installer/win/parameters.json',
], ],
}, }, # end of 'variables'
'conditions': [
['OS=="win"', {
'targets': [ 'targets': [
{ {
'target_name': 'remoting_breakpad_tester', 'target_name': 'remoting_breakpad_tester',
...@@ -478,13 +476,13 @@ ...@@ -478,13 +476,13 @@
], ],
}, # end of target 'remoting_windows_resources' }, # end of target 'remoting_windows_resources'
], # end of 'targets' ], # end of 'targets'
}], # 'OS=="win"'
'conditions': [
# The host installation is generated only if WiX is available. If # The host installation is generated only if WiX is available. If
# component build is used the produced installation will not work due to # component build is used the produced installation will not work due to
# missing DLLs. We build it anyway to make sure the GYP scripts are executed # missing DLLs. We build it anyway to make sure the GYP scripts are executed
# by the bots. # by the bots.
['OS == "win" and wix_exists == "True" and sas_dll_exists == "True"', { ['wix_exists == "True" and sas_dll_exists == "True"', {
'targets': [ 'targets': [
{ {
'target_name': 'remoting_host_installation', 'target_name': 'remoting_host_installation',
...@@ -615,7 +613,20 @@ ...@@ -615,7 +613,20 @@
], # actions ], # actions
}, # end of target 'remoting_me2me_host_archive' }, # end of target 'remoting_me2me_host_archive'
], # end of 'targets' ], # end of 'targets'
}], # '<(wix_path) != ""' }, {
# Dummy targets for when Wix is not available.
'targets': [
{
'target_name': 'remoting_host_installation',
'type': 'none',
},
{
'target_name': 'remoting_me2me_host_archive',
'type': 'none',
},
], # end of 'targets'
}], # 'wix_exists == "True" and sas_dll_exists == "True"'
], # end of 'conditions' ], # end of 'conditions'
} }
remoting/remoting_test.gypi
View file @ 9fb75ed8
...@@ -265,6 +265,7 @@ ...@@ -265,6 +265,7 @@
'dependencies!': [ 'dependencies!': [
'remoting_host', 'remoting_host',
'remoting_host_setup_base', 'remoting_host_setup_base',
'remoting_it2me_host_static',
'remoting_native_messaging_base', 'remoting_native_messaging_base',
], ],
'sources/': [ 'sources/': [
...@@ -273,14 +274,6 @@ ...@@ -273,14 +274,6 @@
['exclude', '^base/resources_unittest\\.cc$'], ['exclude', '^base/resources_unittest\\.cc$'],
] ]
}], }],
['enable_it2me_host == 0', {
'dependencies!': [
'remoting_it2me_host_static',
],
'sources/': [
['exclude', '^host/it2me/'],
]
}],
[ 'OS == "linux" and use_allocator!="none"', { [ 'OS == "linux" and use_allocator!="none"', {
'dependencies': [ 'dependencies': [
'../base/allocator/allocator.gyp:allocator', '../base/allocator/allocator.gyp:allocator',
...@@ -299,7 +292,7 @@ ...@@ -299,7 +292,7 @@
'<@(remoting_webapp_js_browser_test_files)', '<@(remoting_webapp_js_browser_test_files)',
], ],
}, },
], #end of copies ], # end of copies
}, # end of target 'remoting_browser_test_resources' }, # end of target 'remoting_browser_test_resources'
{ {
'target_name': 'remoting_webapp_unittest', 'target_name': 'remoting_webapp_unittest',
...@@ -373,7 +366,7 @@ ...@@ -373,7 +366,7 @@
], ],
}, },
], ],
}, # end of target 'remoting_webapp_js_unittest' }, # end of target 'remoting_webapp_unittest'
], # end of targets ], # end of targets
'conditions': [ 'conditions': [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment