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

Unified Diff: remoting/remoting_host_linux.gypi

Issue 896743004: [Chromoting] Remove wildcard ('*') from remoting_all target. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove obsolete comment Created 5 years, 10 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 | « remoting/remoting_host.gypi ('k') | remoting/remoting_host_mac.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/remoting_host_linux.gypi
diff --git a/remoting/remoting_host_linux.gypi b/remoting/remoting_host_linux.gypi
index 5fe986a7b8143cd7c969b0f6bda7ab0fc0c06fee..7727bc2c83482640c91750bf70de44cd02d110b2 100644
--- a/remoting/remoting_host_linux.gypi
+++ b/remoting/remoting_host_linux.gypi
@@ -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'
}
« no previous file with comments | « remoting/remoting_host.gypi ('k') | remoting/remoting_host_mac.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698