| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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': { | 6 'variables': { |
| 7 'lastchange_path': '../build/util/LASTCHANGE', | 7 'lastchange_path': '../build/util/LASTCHANGE', |
| 8 'libpeer_target_type%': 'static_library', | 8 'libpeer_target_type%': 'static_library', |
| 9 # 'branding_dir' is set in the 'conditions' section at the bottom. | 9 'branding_dir': 'app/theme/<(branding_path_component)', |
| 10 'branding_dir_100': 'app/theme/default_100_percent/<(branding_path_component
)', |
| 10 }, | 11 }, |
| 11 'conditions': [ | 12 'conditions': [ |
| 12 ['OS=="win"', { | 13 ['OS=="win"', { |
| 13 'targets': [ | 14 'targets': [ |
| 14 { | 15 { |
| 15 'target_name': 'gcapi_dll', | 16 'target_name': 'gcapi_dll', |
| 16 'type': 'loadable_module', | 17 'type': 'loadable_module', |
| 17 'dependencies': [ | 18 'dependencies': [ |
| 18 'gcapi_lib', | 19 'gcapi_lib', |
| 19 ], | 20 ], |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 151 }, | 152 }, |
| 152 { | 153 { |
| 153 # GN version: //chrome/installer/util:strings | 154 # GN version: //chrome/installer/util:strings |
| 154 'target_name': 'installer_util_strings', | 155 'target_name': 'installer_util_strings', |
| 155 'type': 'none', | 156 'type': 'none', |
| 156 'actions': [ | 157 'actions': [ |
| 157 { | 158 { |
| 158 'action_name': 'installer_util_strings', | 159 'action_name': 'installer_util_strings', |
| 159 'variables': { | 160 'variables': { |
| 160 'create_string_rc_py': 'installer/util/prebuild/create_string_rc
.py', | 161 'create_string_rc_py': 'installer/util/prebuild/create_string_rc
.py', |
| 162 'brand_strings': '<(branding_path_component)_strings', |
| 161 }, | 163 }, |
| 162 'conditions': [ | 164 |
| 163 ['branding=="Chrome"', { | |
| 164 'variables': { | |
| 165 'brand_strings': 'google_chrome_strings', | |
| 166 }, | |
| 167 }, { | |
| 168 'variables': { | |
| 169 'brand_strings': 'chromium_strings', | |
| 170 }, | |
| 171 }], | |
| 172 ], | |
| 173 'inputs': [ | 165 'inputs': [ |
| 174 '<(create_string_rc_py)', | 166 '<(create_string_rc_py)', |
| 175 'app/<(brand_strings).grd', | 167 'app/<(brand_strings).grd', |
| 176 ], | 168 ], |
| 177 'outputs': [ | 169 'outputs': [ |
| 178 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_uti
l_strings.h', | 170 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_uti
l_strings.h', |
| 179 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_uti
l_strings.rc', | 171 '<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_uti
l_strings.rc', |
| 180 ], | 172 ], |
| 181 'action': ['python', | 173 'action': ['python', |
| 182 '<(create_string_rc_py)', | 174 '<(create_string_rc_py)', |
| (...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 293 '-f', '<(lastchange_path)', | 285 '-f', '<(lastchange_path)', |
| 294 '-f', '<(branding_dir)/BRANDING', | 286 '-f', '<(branding_dir)/BRANDING', |
| 295 '<(template_input_path)', | 287 '<(template_input_path)', |
| 296 '<@(_outputs)', | 288 '<@(_outputs)', |
| 297 ], | 289 ], |
| 298 'process_outputs_as_sources': 1, | 290 'process_outputs_as_sources': 1, |
| 299 'message': 'Generating version information' | 291 'message': 'Generating version information' |
| 300 }, | 292 }, |
| 301 ], | 293 ], |
| 302 'conditions': [ | 294 'conditions': [ |
| 303 # TODO(mark): <(branding_dir) should be defined by the | |
| 304 # global condition block at the bottom of the file, but | |
| 305 # this doesn't work due to the following issue: | |
| 306 # | |
| 307 # http://code.google.com/p/gyp/issues/detail?id=22 | |
| 308 # | |
| 309 # Remove this block once the above issue is fixed. | |
| 310 [ 'branding == "Chrome"', { | |
| 311 'variables': { | |
| 312 'branding_dir': 'app/theme/google_chrome', | |
| 313 'branding_dir_100': 'app/theme/default_100_percent/google_chrom
e', | |
| 314 }, | |
| 315 }, { # else branding!="Chrome" | |
| 316 'variables': { | |
| 317 'branding_dir': 'app/theme/chromium', | |
| 318 'branding_dir_100': 'app/theme/default_100_percent/chromium', | |
| 319 }, | |
| 320 }], | |
| 321 ['target_arch=="ia32"', { | 295 ['target_arch=="ia32"', { |
| 322 'msvs_settings': { | 296 'msvs_settings': { |
| 323 'VCCLCompilerTool': { | 297 'VCCLCompilerTool': { |
| 324 'EnableEnhancedInstructionSet': '4', # NoExtensions | 298 'EnableEnhancedInstructionSet': '4', # NoExtensions |
| 325 }, | 299 }, |
| 326 }, | 300 }, |
| 327 }], | 301 }], |
| 328 ], | 302 ], |
| 329 }, | 303 }, |
| 330 { | 304 { |
| (...skipping 753 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1084 ], | 1058 ], |
| 1085 'include_dirs': [ | 1059 'include_dirs': [ |
| 1086 '..', | 1060 '..', |
| 1087 ], | 1061 ], |
| 1088 'sources': [ | 1062 'sources': [ |
| 1089 'installer/gcapi_mac/gcapi_example_client.mm', | 1063 'installer/gcapi_mac/gcapi_example_client.mm', |
| 1090 ], | 1064 ], |
| 1091 }, | 1065 }, |
| 1092 ], # targets | 1066 ], # targets |
| 1093 }], # OS=="mac" | 1067 }], # OS=="mac" |
| 1094 [ 'branding == "Chrome"', { | |
| 1095 'variables': { | |
| 1096 'branding_dir': 'app/theme/google_chrome', | |
| 1097 'branding_dir_100': 'app/theme/default_100_percent/google_chrome', | |
| 1098 }, | |
| 1099 }, { # else branding!="Chrome" | |
| 1100 'variables': { | |
| 1101 'branding_dir': 'app/theme/chromium', | |
| 1102 'branding_dir_100': 'app/theme/default_100_percent/chromium', | |
| 1103 }, | |
| 1104 }], | |
| 1105 ], | 1068 ], |
| 1106 } | 1069 } |
| OLD | NEW |