| Index: cc/cc.gyp
|
| diff --git a/cc/cc.gyp b/cc/cc.gyp
|
| index 35606e1c5f5755a3cb9878aa27165a4e624f6fba..62ff5416ca603a0ce6b541569dbfeae6d72e49d9 100644
|
| --- a/cc/cc.gyp
|
| +++ b/cc/cc.gyp
|
| @@ -227,7 +227,7 @@
|
| 'targets': [
|
| {
|
| 'target_name': 'cc',
|
| - 'type': 'static_library',
|
| + 'type': '<(component)',
|
| 'includes': [
|
| 'cc.gypi',
|
| ],
|
| @@ -241,10 +241,10 @@
|
| '<(webkit_src_dir)/Source/WTF/WTF.gyp/WTF.gyp:wtf',
|
| '<(webkit_src_dir)/Source/WebCore/WebCore.gyp/WebCore.gyp:webcore_platform_geometry',
|
| '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit_wtf_support',
|
| + '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
|
| ],
|
| 'defines': [
|
| - # http://crbug.com/154052
|
| - 'WEBKIT_GLUE_IMPLEMENTATION=1',
|
| + 'CC_IMPLEMENTATION=1',
|
| ],
|
| 'include_dirs': [
|
| '<(webkit_src_dir)/Source/Platform/chromium',
|
|
|