| OLD | NEW | 
|    1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. |    1 # Copyright (c) 2013 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     # File lists shared with GN build. |    7     # File lists shared with GN build. | 
|    8     'chrome_common_sources': [ |    8     'chrome_common_sources': [ | 
|    9       'common/all_messages.h', |    9       'common/all_messages.h', | 
|   10       'common/attrition_experiments.h', |   10       'common/attrition_experiments.h', | 
| (...skipping 515 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  526         }], |  526         }], | 
|  527       ], |  527       ], | 
|  528       'export_dependent_settings': [ |  528       'export_dependent_settings': [ | 
|  529         '../base/base.gyp:base', |  529         '../base/base.gyp:base', | 
|  530       ], |  530       ], | 
|  531     }, |  531     }, | 
|  532     { |  532     { | 
|  533       # GN version: //chrome/common:version |  533       # GN version: //chrome/common:version | 
|  534       'target_name': 'common_version', |  534       'target_name': 'common_version', | 
|  535       'type': 'none', |  535       'type': 'none', | 
|  536       'conditions': [ |  536       'direct_dependent_settings': { | 
|  537         ['os_posix == 1 and OS != "mac" and OS != "ios"', { |  537         'include_dirs': [ | 
|  538           'direct_dependent_settings': { |  538           '<(SHARED_INTERMEDIATE_DIR)', | 
|  539             'include_dirs': [ |  539         ], | 
|  540               '<(SHARED_INTERMEDIATE_DIR)', |  540       }, | 
|  541             ], |  541       # Because generate_version generates a header, we must set the | 
 |  542       # hard_dependency flag. | 
 |  543       'hard_dependency': 1, | 
 |  544       'actions': [ | 
 |  545         { | 
 |  546           'action_name': 'generate_version', | 
 |  547           'variables': { | 
 |  548             'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', | 
 |  549             'version_py_path': '<(DEPTH)/build/util/version.py', | 
 |  550             'version_path': 'VERSION', | 
 |  551             'template_input_path': 'common/chrome_version_info_values.h.version'
     , | 
|  542           }, |  552           }, | 
|  543           # Because posix_version generates a header, we must set the |  553           'conditions': [ | 
|  544           # hard_dependency flag. |  554             [ 'branding == "Chrome"', { | 
|  545           'hard_dependency': 1, |  | 
|  546           'actions': [ |  | 
|  547             { |  | 
|  548               'action_name': 'posix_version', |  | 
|  549               'variables': { |  555               'variables': { | 
|  550                 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE', |  556                   'branding_path': | 
|  551                 'version_py_path': '<(DEPTH)/build/util/version.py', |  557                     'app/theme/google_chrome/BRANDING', | 
|  552                 'version_path': 'VERSION', |  | 
|  553                 'template_input_path': 'common/chrome_version_info_posix.h.versi
     on', |  | 
|  554               }, |  558               }, | 
|  555               'conditions': [ |  559             }, { # else branding!="Chrome" | 
|  556                 [ 'branding == "Chrome"', { |  560               'variables': { | 
|  557                   'variables': { |  561                   'branding_path': | 
|  558                      'branding_path': |  562                     'app/theme/chromium/BRANDING', | 
|  559                        'app/theme/google_chrome/BRANDING', |  563               }, | 
|  560                   }, |  564             }], | 
|  561                 }, { # else branding!="Chrome" |  | 
|  562                   'variables': { |  | 
|  563                      'branding_path': |  | 
|  564                        'app/theme/chromium/BRANDING', |  | 
|  565                   }, |  | 
|  566                 }], |  | 
|  567               ], |  | 
|  568               'inputs': [ |  | 
|  569                 '<(template_input_path)', |  | 
|  570                 '<(version_path)', |  | 
|  571                 '<(branding_path)', |  | 
|  572                 '<(lastchange_path)', |  | 
|  573               ], |  | 
|  574               'outputs': [ |  | 
|  575                 '<(SHARED_INTERMEDIATE_DIR)/chrome/common/chrome_version_info_po
     six.h', |  | 
|  576               ], |  | 
|  577               'action': [ |  | 
|  578                 'python', |  | 
|  579                 '<(version_py_path)', |  | 
|  580                 '-f', '<(version_path)', |  | 
|  581                 '-f', '<(branding_path)', |  | 
|  582                 '-f', '<(lastchange_path)', |  | 
|  583                 '<(template_input_path)', |  | 
|  584                 '<@(_outputs)', |  | 
|  585               ], |  | 
|  586               'message': 'Generating version information', |  | 
|  587             }, |  | 
|  588           ], |  565           ], | 
|  589         }], |  566           'inputs': [ | 
 |  567             '<(template_input_path)', | 
 |  568             '<(version_path)', | 
 |  569             '<(branding_path)', | 
 |  570             '<(lastchange_path)', | 
 |  571           ], | 
 |  572           'outputs': [ | 
 |  573             '<(SHARED_INTERMEDIATE_DIR)/chrome/common/chrome_version_info_values
     .h', | 
 |  574           ], | 
 |  575           'action': [ | 
 |  576             'python', | 
 |  577             '<(version_py_path)', | 
 |  578             '-f', '<(version_path)', | 
 |  579             '-f', '<(branding_path)', | 
 |  580             '-f', '<(lastchange_path)', | 
 |  581             '<(template_input_path)', | 
 |  582             '<@(_outputs)', | 
 |  583           ], | 
 |  584           'message': 'Generating version information', | 
 |  585         }, | 
|  590       ], |  586       ], | 
|  591     }, |  587     }, | 
|  592     { |  588     { | 
|  593       # GN version: //chrome/common/net |  589       # GN version: //chrome/common/net | 
|  594       'target_name': 'common_net', |  590       'target_name': 'common_net', | 
|  595       'type': 'static_library', |  591       'type': 'static_library', | 
|  596       'sources': [ |  592       'sources': [ | 
|  597         'common/net/net_error_info.cc', |  593         'common/net/net_error_info.cc', | 
|  598         'common/net/net_error_info.h', |  594         'common/net/net_error_info.h', | 
|  599         'common/net/net_resource_provider.cc', |  595         'common/net/net_resource_provider.cc', | 
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  684         'common/safe_browsing/csd.proto' |  680         'common/safe_browsing/csd.proto' | 
|  685       ], |  681       ], | 
|  686       'variables': { |  682       'variables': { | 
|  687         'proto_in_dir': 'common/safe_browsing', |  683         'proto_in_dir': 'common/safe_browsing', | 
|  688         'proto_out_dir': 'chrome/common/safe_browsing', |  684         'proto_out_dir': 'chrome/common/safe_browsing', | 
|  689       }, |  685       }, | 
|  690       'includes': [ '../build/protoc.gypi' ], |  686       'includes': [ '../build/protoc.gypi' ], | 
|  691     }, |  687     }, | 
|  692   ], |  688   ], | 
|  693 } |  689 } | 
| OLD | NEW |