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

Side by Side Diff: remoting/remoting_host_linux.gypi

Issue 905223002: Revert of [Chromoting] Remove wildcard ('*') from remoting_all target. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
« no previous file with comments | « remoting/remoting_host.gypi ('k') | remoting/remoting_host_mac.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': {
7 'build_deb_script': 'host/installer/linux/build-deb.sh',
8 'deb_filename': 'host/installer/<!(["<(build_deb_script)", "-p", "-s", "<(DE PTH)"])',
9 'packaging_outputs': [
10 '<(deb_filename)',
11 '<!(echo <(deb_filename) | sed -e "s/.deb$/.changes/")',
12 '<(PRODUCT_DIR)/remoting_me2me_host.debug',
13 '<(PRODUCT_DIR)/remoting_start_host.debug',
14 '<(PRODUCT_DIR)/native_messaging_host.debug',
15 '<(PRODUCT_DIR)/remote_assistance_host.debug',
16 ]
17 },
18
19 'conditions': [ 6 'conditions': [
20 ['(branding=="Chrome" and enable_remoting_host==1 and chromeos==0) or (archi ve_chromoting_tests==1)', { 7 ['OS=="linux" and ( (branding=="Chrome" and enable_remoting_host==1 and chro meos==0) or (archive_chromoting_tests==1) )', {
21 8 'variables': {
9 'build_deb_script': 'host/installer/linux/build-deb.sh',
10 'deb_filename': 'host/installer/<!(["<(build_deb_script)", "-p", "-s", " <(DEPTH)"])',
11 'packaging_outputs': [
12 '<(deb_filename)',
13 '<!(echo <(deb_filename) | sed -e "s/.deb$/.changes/")',
14 '<(PRODUCT_DIR)/remoting_me2me_host.debug',
15 '<(PRODUCT_DIR)/remoting_start_host.debug',
16 '<(PRODUCT_DIR)/native_messaging_host.debug',
17 '<(PRODUCT_DIR)/remote_assistance_host.debug',
18 ]
19 },
22 'targets': [ 20 'targets': [
23 { 21 {
24 # Store the installer package(s) into a zip file so there is a 22 # Store the installer package(s) into a zip file so there is a
25 # consistent filename to reference for build archiving (i.e. in 23 # consistent filename to reference for build archiving (i.e. in
26 # FILES.cfg). This also avoids possible conflicts with "wildcard" 24 # FILES.cfg). This also avoids possible conflicts with "wildcard"
27 # package handling in other build/signing scripts. 25 # package handling in other build/signing scripts.
28 'target_name': 'remoting_me2me_host_archive', 26 'target_name': 'remoting_me2me_host_archive',
29 'type': 'none', 27 'type': 'none',
30 'dependencies': [ 28 'dependencies': [
31 'remoting_me2me_host_deb_installer', 29 'remoting_me2me_host_deb_installer',
32 ], 30 ],
33 'actions': [ 31 'actions': [
34 { 32 {
35 'action_name': 'build_linux_installer_zip', 33 'action_name': 'build_linux_installer_zip',
36 'inputs': [ 34 'inputs': [
37 '<@(packaging_outputs)', 35 '<@(packaging_outputs)',
38 ], 36 ],
39 'outputs': [ 37 'outputs': [
40 '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip', 38 '<(PRODUCT_DIR)/remoting-me2me-host-<(OS).zip',
41 ], 39 ],
42 'action': [ 'zip', '-j', '-0', '<@(_outputs)', '<@(_inputs)' ], 40 'action': [ 'zip', '-j', '-0', '<@(_outputs)', '<@(_inputs)' ],
43 }, 41 },
44 ], 42 ],
45 }, { 43 },
44 {
46 'target_name': 'remoting_me2me_host_deb_installer', 45 'target_name': 'remoting_me2me_host_deb_installer',
47 'type': 'none', 46 'type': 'none',
48 'dependencies': [ 47 'dependencies': [
49 '<(icu_gyp_path):icudata', 48 '<(icu_gyp_path):icudata',
50 'remoting_it2me_native_messaging_host', 49 'remoting_it2me_native_messaging_host',
51 'remoting_me2me_host', 50 'remoting_me2me_host',
52 'remoting_me2me_native_messaging_host', 51 'remoting_me2me_native_messaging_host',
53 'remoting_native_messaging_manifests', 52 'remoting_native_messaging_manifests',
54 'remoting_resources', 53 'remoting_resources',
55 'remoting_start_host', 54 'remoting_start_host',
(...skipping 13 matching lines...) Expand all
69 'host/installer/linux/debian/preinst', 68 'host/installer/linux/debian/preinst',
70 'host/installer/linux/debian/rules', 69 'host/installer/linux/debian/rules',
71 ], 70 ],
72 'outputs': [ 71 'outputs': [
73 '<@(packaging_outputs)', 72 '<@(packaging_outputs)',
74 ], 73 ],
75 'action': [ '<(build_deb_script)', '-s', '<(DEPTH)' ], 74 'action': [ '<(build_deb_script)', '-s', '<(DEPTH)' ],
76 }, 75 },
77 ], 76 ],
78 }, 77 },
79 ], # end of 'targets' 78 ],
80 }, { 79 }], # OS=="linux" and branding=="Chrome"
81 # Dummy targets.
82 'targets': [
83 {
84 'target_name': 'remoting_me2me_host_archive',
85 'type': 'none',
86 },
87 ], # end of 'targets'
88 }], # branding=="Chrome"
89 80
90 ['enable_remoting_host==1', { 81 ['OS=="linux" and enable_remoting_host==1', {
91 'targets': [ 82 'targets': [
92 # Linux breakpad processing 83 # Linux breakpad processing
93 # The following target is disabled temporarily because it was failing 84 # The following target is disabled temporarily because it was failing
94 # on build bots. See crbug.com/386886 . 85 # on build bots. See crbug.com/386886 .
95 # 86 #
96 # { 87 # {
97 # 'target_name': 'remoting_linux_symbols', 88 # 'target_name': 'remoting_linux_symbols',
98 # 'type': 'none', 89 # 'type': 'none',
99 # 'conditions': [ 90 # 'conditions': [
100 # ['linux_dump_symbols==1', { 91 # ['linux_dump_symbols==1', {
(...skipping 18 matching lines...) Expand all
119 # }, 110 # },
120 # ], 111 # ],
121 # 'dependencies': [ 112 # 'dependencies': [
122 # 'remoting_me2me_host', 113 # 'remoting_me2me_host',
123 # '../breakpad/breakpad.gyp:dump_syms', 114 # '../breakpad/breakpad.gyp:dump_syms',
124 # ], 115 # ],
125 # }], # 'linux_dump_symbols==1' 116 # }], # 'linux_dump_symbols==1'
126 # ], # end of 'conditions' 117 # ], # end of 'conditions'
127 # }, # end of target 'remoting_linux_symbols' 118 # }, # end of target 'remoting_linux_symbols'
128 ], # end of 'targets' 119 ], # end of 'targets'
129 }], # 'enable_remoting_host==1' 120 }], # 'OS=="linux"'
130 121
131 ], # end of 'conditions' 122 ], # end of 'conditions'
132 } 123 }
OLDNEW
« 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