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
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 939 additions and 844 deletions
remoting/remoting_all.gyp
View file @ 9fb75ed8
......@@ -3,14 +3,76 @@
# found in the LICENSE file.
{
'includes': [
'remoting_enable.gypi',
],
'targets': [
{
'target_name': 'remoting_all',
'type': 'none',
'dependencies': [
'../remoting/remoting.gyp:*',
'../remoting/app_remoting_webapp.gyp:*',
'../remoting/remoting.gyp:remoting_base',
'../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 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
This diff is collapsed.
remoting/remoting_host_linux.gypi
View file @ 9fb75ed8
......@@ -3,20 +3,22 @@
# found in the LICENSE file.
{
'variables': {
'build_deb_script': 'host/installer/linux/build-deb.sh',
'deb_filename': 'host/installer/<!(["<(build_deb_script)", "-p", "-s", "<(DEPTH)"])',
'packaging_outputs': [
'<(deb_filename)',
'<!(echo <(deb_filename) | sed -e "s/.deb$/.changes/")',
'<(PRODUCT_DIR)/remoting_me2me_host.debug',
'<(PRODUCT_DIR)/remoting_start_host.debug',
'<(PRODUCT_DIR)/native_messaging_host.debug',
'<(PRODUCT_DIR)/remote_assistance_host.debug',
]
},
'conditions': [
['OS=="linux" and ( (branding=="Chrome" and enable_remoting_host==1 and chromeos==0) or (archive_chromoting_tests==1) )', {
'variables': {
'build_deb_script': 'host/installer/linux/build-deb.sh',
'deb_filename': 'host/installer/<!(["<(build_deb_script)", "-p", "-s", "<(DEPTH)"])',
'packaging_outputs': [
'<(deb_filename)',
'<!(echo <(deb_filename) | sed -e "s/.deb$/.changes/")',
'<(PRODUCT_DIR)/remoting_me2me_host.debug',
'<(PRODUCT_DIR)/remoting_start_host.debug',
'<(PRODUCT_DIR)/native_messaging_host.debug',
'<(PRODUCT_DIR)/remote_assistance_host.debug',
]
},
['(branding=="Chrome" and enable_remoting_host==1 and chromeos==0) or (archive_chromoting_tests==1)', {
'targets': [
{
# Store the installer package(s) into a zip file so there is a
......@@ -40,8 +42,7 @@
'action': [ 'zip', '-j', '-0', '<@(_outputs)', '<@(_inputs)' ],
},
],
},
{
}, {
'target_name': 'remoting_me2me_host_deb_installer',
'type': 'none',
'dependencies': [
......@@ -75,10 +76,18 @@
},
],
},
],
}], # OS=="linux" and branding=="Chrome"
], # end of 'targets'
}, {
# 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': [
# Linux breakpad processing
# The following target is disabled temporarily because it was failing
......@@ -117,7 +126,7 @@
# ], # end of 'conditions'
# }, # end of target 'remoting_linux_symbols'
], # end of 'targets'
}], # 'OS=="linux"'
}], # 'enable_remoting_host==1'
], # end of 'conditions'
}
remoting/remoting_host_mac.gypi
View file @ 9fb75ed8
This diff is collapsed.
remoting/remoting_host_win.gypi
View file @ 9fb75ed8
This diff is collapsed.
remoting/remoting_test.gypi
View file @ 9fb75ed8
......@@ -265,6 +265,7 @@
'dependencies!': [
'remoting_host',
'remoting_host_setup_base',
'remoting_it2me_host_static',
'remoting_native_messaging_base',
],
'sources/': [
......@@ -273,14 +274,6 @@
['exclude', '^base/resources_unittest\\.cc$'],
]
}],
['enable_it2me_host == 0', {
'dependencies!': [
'remoting_it2me_host_static',
],
'sources/': [
['exclude', '^host/it2me/'],
]
}],
[ 'OS == "linux" and use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
......@@ -299,7 +292,7 @@
'<@(remoting_webapp_js_browser_test_files)',
],
},
], #end of copies
], # end of copies
}, # end of target 'remoting_browser_test_resources'
{
'target_name': 'remoting_webapp_unittest',
......@@ -373,7 +366,7 @@
],
},
],
}, # end of target 'remoting_webapp_js_unittest'
}, # end of target 'remoting_webapp_unittest'
], # end of targets
'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