| OLD | NEW | 
|---|
| 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2011 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     'conditions': [ | 7     'conditions': [ | 
| 8       ['inside_chromium_build==0', { | 8       ['inside_chromium_build==0', { | 
| 9         'webkit_src_dir': '../../../../..', | 9         'webkit_src_dir': '../../../../..', | 
| 10       },{ | 10       },{ | 
| 11         'webkit_src_dir': '../../third_party/WebKit', | 11         'webkit_src_dir': '../../third_party/WebKit', | 
| 12       }], | 12       }], | 
| 13     ], | 13     ], | 
| 14   }, | 14   }, | 
| 15   'targets': [ | 15   'targets': [ | 
| 16     { | 16     { | 
| 17       'target_name': 'webkit_resources', | 17       'target_name': 'webkit_resources', | 
| 18       'type': 'none', | 18       'type': 'none', | 
| 19       'msvs_guid': '0B469837-3D46-484A-AFB3-C5A6C68730B9', |  | 
| 20       'variables': { | 19       'variables': { | 
| 21         'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', | 20         'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', | 
| 22       }, | 21       }, | 
| 23       'actions': [ | 22       'actions': [ | 
| 24         { | 23         { | 
| 25           'action_name': 'webkit_resources', | 24           'action_name': 'webkit_resources', | 
| 26           'variables': { | 25           'variables': { | 
| 27             'grit_grd_file': 'webkit_resources.grd', | 26             'grit_grd_file': 'webkit_resources.grd', | 
| 28           }, | 27           }, | 
| 29           'includes': [ '../../build/grit_action.gypi' ], | 28           'includes': [ '../../build/grit_action.gypi' ], | 
| 30         }, | 29         }, | 
| 31         { | 30         { | 
| 32           'action_name': 'webkit_chromium_resources', | 31           'action_name': 'webkit_chromium_resources', | 
| 33           'variables': { | 32           'variables': { | 
| 34             'grit_grd_file': '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gr
     d', | 33             'grit_grd_file': '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gr
     d', | 
| 35           }, | 34           }, | 
| 36           'includes': [ '../../build/grit_action.gypi' ], | 35           'includes': [ '../../build/grit_action.gypi' ], | 
| 37         }, | 36         }, | 
| 38       ], | 37       ], | 
| 39       'includes': [ '../../build/grit_target.gypi' ], | 38       'includes': [ '../../build/grit_target.gypi' ], | 
| 40     }, | 39     }, | 
| 41     { | 40     { | 
| 42       'target_name': 'webkit_strings', | 41       'target_name': 'webkit_strings', | 
| 43       'type': 'none', | 42       'type': 'none', | 
| 44       'msvs_guid': '60B43839-95E6-4526-A661-209F16335E0E', |  | 
| 45       'variables': { | 43       'variables': { | 
| 46         'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', | 44         'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit', | 
| 47       }, | 45       }, | 
| 48       'actions': [ | 46       'actions': [ | 
| 49         { | 47         { | 
| 50           'action_name': 'webkit_strings', | 48           'action_name': 'webkit_strings', | 
| 51           'variables': { | 49           'variables': { | 
| 52             'grit_grd_file': 'webkit_strings.grd', | 50             'grit_grd_file': 'webkit_strings.grd', | 
| 53           }, | 51           }, | 
| 54           'includes': [ '../../build/grit_action.gypi' ], | 52           'includes': [ '../../build/grit_action.gypi' ], | 
| 55         }, | 53         }, | 
| 56       ], | 54       ], | 
| 57       'includes': [ '../../build/grit_target.gypi' ], | 55       'includes': [ '../../build/grit_target.gypi' ], | 
| 58     }, | 56     }, | 
| 59     { | 57     { | 
| 60       'target_name': 'webkit_user_agent', | 58       'target_name': 'webkit_user_agent', | 
| 61       'type': 'static_library', | 59       'type': 'static_library', | 
| 62       'msvs_guid': 'DB162DE1-7D56-4C4A-8A9F-80D396CD7AA8', |  | 
| 63       'dependencies': [ | 60       'dependencies': [ | 
| 64         '<(DEPTH)/app/app.gyp:app_base', | 61         '<(DEPTH)/app/app.gyp:app_base', | 
| 65         '<(DEPTH)/base/base.gyp:base_i18n', | 62         '<(DEPTH)/base/base.gyp:base_i18n', | 
| 66       ], | 63       ], | 
| 67       'actions': [ | 64       'actions': [ | 
| 68         { | 65         { | 
| 69           'action_name': 'webkit_version', | 66           'action_name': 'webkit_version', | 
| 70           'inputs': [ | 67           'inputs': [ | 
| 71             '<(script)', | 68             '<(script)', | 
| 72             '<(webkit_src_dir)<(version_file)', | 69             '<(webkit_src_dir)<(version_file)', | 
| (...skipping 23 matching lines...) Expand all  Loading... | 
| 96       ], | 93       ], | 
| 97       # Dependents may rely on files generated by this target or one of its | 94       # Dependents may rely on files generated by this target or one of its | 
| 98       # own hard dependencies. | 95       # own hard dependencies. | 
| 99       'hard_dependency': 1, | 96       'hard_dependency': 1, | 
| 100       'conditions': [ | 97       'conditions': [ | 
| 101       ], | 98       ], | 
| 102     }, | 99     }, | 
| 103     { | 100     { | 
| 104       'target_name': 'glue', | 101       'target_name': 'glue', | 
| 105       'type': 'static_library', | 102       'type': 'static_library', | 
| 106       'msvs_guid': 'C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09', |  | 
| 107       #TODO(dmichael): Remove this #define once all plugins are ported from | 103       #TODO(dmichael): Remove this #define once all plugins are ported from | 
| 108       #                PPP_Instance and PPB_Instance scripting functions. | 104       #                PPP_Instance and PPB_Instance scripting functions. | 
| 109       'defines': [ | 105       'defines': [ | 
| 110         'PPAPI_INSTANCE_REMOVE_SCRIPTING', | 106         'PPAPI_INSTANCE_REMOVE_SCRIPTING', | 
| 111       ], | 107       ], | 
| 112       'dependencies': [ | 108       'dependencies': [ | 
| 113         '<(DEPTH)/app/app.gyp:app_base', | 109         '<(DEPTH)/app/app.gyp:app_base', | 
| 114         '<(DEPTH)/base/base.gyp:base_i18n', | 110         '<(DEPTH)/base/base.gyp:base_i18n', | 
| 115         '<(DEPTH)/gpu/gpu.gyp:gles2_implementation', | 111         '<(DEPTH)/gpu/gpu.gyp:gles2_implementation', | 
| 116         '<(DEPTH)/net/net.gyp:net', | 112         '<(DEPTH)/net/net.gyp:net', | 
| (...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 541               }, | 537               }, | 
| 542               'includes': [ '../../build/grit_action.gypi' ], | 538               'includes': [ '../../build/grit_action.gypi' ], | 
| 543             }, | 539             }, | 
| 544           ], | 540           ], | 
| 545           'includes': [ '../../build/grit_target.gypi' ], | 541           'includes': [ '../../build/grit_target.gypi' ], | 
| 546         }, | 542         }, | 
| 547       ], | 543       ], | 
| 548     }], | 544     }], | 
| 549   ], | 545   ], | 
| 550 } | 546 } | 
| OLD | NEW | 
|---|