| 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     'chromium_code': 1,  # Use higher warning level. | 7     'chromium_code': 1,  # Use higher warning level. | 
| 8   }, | 8   }, | 
| 9   'target_defaults': { | 9   'target_defaults': { | 
| 10     'conditions': [ | 10     'conditions': [ | 
| (...skipping 24 matching lines...) Expand all  Loading... | 
| 35     { | 35     { | 
| 36       'target_name': 'ppapi_shared', | 36       'target_name': 'ppapi_shared', | 
| 37       'type': '<(component)', | 37       'type': '<(component)', | 
| 38       'variables': { | 38       'variables': { | 
| 39         # Set the ppapi_shared_target variable, so that we will pull in the | 39         # Set the ppapi_shared_target variable, so that we will pull in the | 
| 40         # sources from ppapi_shared.gypi (and only from there). We follow the | 40         # sources from ppapi_shared.gypi (and only from there). We follow the | 
| 41         # same pattern for the other targets defined within this file. | 41         # same pattern for the other targets defined within this file. | 
| 42         'ppapi_shared_target': 1, | 42         'ppapi_shared_target': 1, | 
| 43       }, | 43       }, | 
| 44       'dependencies': [ | 44       'dependencies': [ | 
| 45         'ppapi.gyp:ppapi_c', |  | 
| 46         '../base/base.gyp:base', | 45         '../base/base.gyp:base', | 
| 47         '../base/base.gyp:base_i18n', | 46         '../base/base.gyp:base_i18n', | 
| 48         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
     _annotations', | 47         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic
     _annotations', | 
| 49         '../build/temp_gyp/googleurl.gyp:googleurl', |  | 
| 50         '../gpu/command_buffer/command_buffer.gyp:gles2_utils', | 48         '../gpu/command_buffer/command_buffer.gyp:gles2_utils', | 
| 51         '../gpu/gpu.gyp:command_buffer_client', | 49         '../gpu/gpu.gyp:command_buffer_client', | 
| 52         '../gpu/gpu.gyp:gles2_implementation', | 50         '../gpu/gpu.gyp:gles2_implementation', | 
| 53         '../media/media.gyp:shared_memory_support', | 51         '../media/media.gyp:shared_memory_support', | 
| 54         '../skia/skia.gyp:skia', | 52         '../skia/skia.gyp:skia', | 
| 55         # TODO(ananta) : The WebKit dependency needs to move to a new target for
      NACL. | 53         # TODO(ananta) : The WebKit dependency needs to move to a new target for
      NACL. | 
| 56         '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', | 54         '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', | 
| 57         '../third_party/icu/icu.gyp:icuuc', | 55         '../third_party/icu/icu.gyp:icuuc', | 
| 58         '../ui/surface/surface.gyp:surface', | 56         '../ui/surface/surface.gyp:surface', | 
|  | 57         '../url/url.gyp:url_lib', | 
|  | 58         'ppapi.gyp:ppapi_c', | 
| 59       ], | 59       ], | 
| 60       'export_dependent_settings': [ | 60       'export_dependent_settings': [ | 
| 61         '../base/base.gyp:base', | 61         '../base/base.gyp:base', | 
| 62         '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', | 62         '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', | 
| 63       ], | 63       ], | 
| 64       'conditions': [ | 64       'conditions': [ | 
| 65         ['OS=="mac"', { | 65         ['OS=="mac"', { | 
| 66           'link_settings': { | 66           'link_settings': { | 
| 67             'libraries': [ | 67             'libraries': [ | 
| 68               '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', | 68               '$(SDKROOT)/System/Library/Frameworks/QuartzCore.framework', | 
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 235           }, | 235           }, | 
| 236           'configurations': { | 236           'configurations': { | 
| 237             'Common_Base': { | 237             'Common_Base': { | 
| 238               'msvs_target_platform': 'x64', | 238               'msvs_target_platform': 'x64', | 
| 239             }, | 239             }, | 
| 240           }, | 240           }, | 
| 241       }], | 241       }], | 
| 242     }], | 242     }], | 
| 243   ], | 243   ], | 
| 244 } | 244 } | 
| OLD | NEW | 
|---|