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

Issues Search
    My Issues | Starred     Open | Closed | All

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 unused dep Created 5 years, 11 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_all.gyp ('k') | remoting/remoting_host_mac.gypi » ('j') | remoting/remoting_host_mac.gypi » ('J')
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..9ed1b00faab1bd6874a576076b768d984831c6da 100644
--- a/remoting/remoting_host_linux.gypi
+++ b/remoting/remoting_host_linux.gypi
@@ -4,7 +4,8 @@
{
'conditions': [
- ['OS=="linux" and ( (branding=="Chrome" and enable_remoting_host==1 and chromeos==0) or (archive_chromoting_tests==1) )', {
+ ['OS=="linux"', {
kelvinp 2015/02/04 01:01:58 Maybe we can move the conditions to remoting_host.
+
'variables': {
'build_deb_script': 'host/installer/linux/build-deb.sh',
'deb_filename': 'host/installer/<!(["<(build_deb_script)", "-p", "-s", "<(DEPTH)"])',
@@ -17,69 +18,81 @@
'<(PRODUCT_DIR)/remote_assistance_host.debug',
]
},
- 'targets': [
- {
- # Store the installer package(s) into a zip file so there is a
- # consistent filename to reference for build archiving (i.e. in
- # FILES.cfg). This also avoids possible conflicts with "wildcard"
- # package handling in other build/signing scripts.
- 'target_name': 'remoting_me2me_host_archive',
- 'type': 'none',
- 'dependencies': [
- 'remoting_me2me_host_deb_installer',
- ],
- 'actions': [
+
+ 'conditions': [
+ ['(branding=="Chrome" and enable_remoting_host==1 and chromeos==0) or (archive_chromoting_tests==1)', {
+
+ 'targets': [
{
- 'action_name': 'build_linux_installer_zip',
- 'inputs': [
- '<@(packaging_outputs)',
+ # Store the installer package(s) into a zip file so there is a
+ # consistent filename to reference for build archiving (i.e. in
+ # FILES.cfg). This also avoids possible conflicts with "wildcard"
+ # package handling in other build/signing scripts.
+ 'target_name': 'remoting_me2me_host_archive',
+ 'type': 'none',
+ 'dependencies': [
+ 'remoting_me2me_host_deb_installer',
],
- 'outputs': [
- '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip',
+ 'actions': [
+ {
+ 'action_name': 'build_linux_installer_zip',
+ 'inputs': [
+ '<@(packaging_outputs)',
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip',
+ ],
+ 'action': [ 'zip', '-j', '-0', '<@(_outputs)', '<@(_inputs)' ],
+ },
],
- 'action': [ 'zip', '-j', '-0', '<@(_outputs)', '<@(_inputs)' ],
},
- ],
- },
- {
- 'target_name': 'remoting_me2me_host_deb_installer',
- 'type': 'none',
- 'dependencies': [
- '<(icu_gyp_path):icudata',
- 'remoting_it2me_native_messaging_host',
- 'remoting_me2me_host',
- 'remoting_me2me_native_messaging_host',
- 'remoting_native_messaging_manifests',
- 'remoting_resources',
- 'remoting_start_host',
- ],
- 'actions': [
{
- 'action_name': 'build_debian_package',
- 'inputs': [
- '<(build_deb_script)',
- 'host/installer/linux/Makefile',
- 'host/installer/linux/debian/chrome-remote-desktop.init',
- 'host/installer/linux/debian/chrome-remote-desktop.pam',
- 'host/installer/linux/debian/compat',
- 'host/installer/linux/debian/control',
- 'host/installer/linux/debian/copyright',
- 'host/installer/linux/debian/postinst',
- 'host/installer/linux/debian/preinst',
- 'host/installer/linux/debian/rules',
+ 'target_name': 'remoting_me2me_host_deb_installer',
+ 'type': 'none',
+ 'dependencies': [
+ '<(icu_gyp_path):icudata',
+ 'remoting_it2me_native_messaging_host',
+ 'remoting_me2me_host',
+ 'remoting_me2me_native_messaging_host',
+ 'remoting_native_messaging_manifests',
+ 'remoting_resources',
+ 'remoting_start_host',
],
- 'outputs': [
- '<@(packaging_outputs)',
+ 'actions': [
+ {
+ 'action_name': 'build_debian_package',
+ 'inputs': [
+ '<(build_deb_script)',
+ 'host/installer/linux/Makefile',
+ 'host/installer/linux/debian/chrome-remote-desktop.init',
+ 'host/installer/linux/debian/chrome-remote-desktop.pam',
+ 'host/installer/linux/debian/compat',
+ 'host/installer/linux/debian/control',
+ 'host/installer/linux/debian/copyright',
+ 'host/installer/linux/debian/postinst',
+ 'host/installer/linux/debian/preinst',
+ 'host/installer/linux/debian/rules',
+ ],
+ 'outputs': [
+ '<@(packaging_outputs)',
+ ],
+ 'action': [ '<(build_deb_script)', '-s', '<(DEPTH)' ],
+ },
],
- 'action': [ '<(build_deb_script)', '-s', '<(DEPTH)' ],
},
- ],
- },
- ],
- }], # 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', {
- 'targets': [
+ ['enable_remoting_host==1', {
+ 'targets': [
# Linux breakpad processing
# The following target is disabled temporarily because it was failing
# on build bots. See crbug.com/386886 .
@@ -116,8 +129,11 @@
# }], # 'linux_dump_symbols==1'
# ], # end of 'conditions'
# }, # end of target 'remoting_linux_symbols'
- ], # end of 'targets'
- }], # 'OS=="linux"'
+ ], # end of 'targets'
+ }], # 'enable_remoting_host==1'
+
+ ], # end of 'conditions'
+ }], # OS=="linux"
], # end of 'conditions'
}
« no previous file with comments | « remoting/remoting_all.gyp ('k') | remoting/remoting_host_mac.gypi » ('j') | remoting/remoting_host_mac.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698