Title: [104074] trunk/Source
- Revision
- 104074
- Author
- [email protected]
- Date
- 2012-01-04 14:26:33 -0800 (Wed, 04 Jan 2012)
Log Message
[chromium] Compile fix, rename libplatform.a to libwebkit_platform.a to avoid collision with nacl
Source/Platform:
* Platform.gyp/Platform.gyp:
Source/WebKit/chromium:
* WebKit.gyp:
Modified Paths
Diff
Modified: trunk/Source/Platform/ChangeLog (104073 => 104074)
--- trunk/Source/Platform/ChangeLog 2012-01-04 22:24:40 UTC (rev 104073)
+++ trunk/Source/Platform/ChangeLog 2012-01-04 22:26:33 UTC (rev 104074)
@@ -1,5 +1,11 @@
2012-01-04 James Robinson <[email protected]>
+ [chromium] Compile fix, rename libplatform.a to libwebkit_platform.a to avoid collision with nacl
+
+ * Platform.gyp/Platform.gyp:
+
+2012-01-04 James Robinson <[email protected]>
+
[chromium] Move WebMimeRegistry and dependencies to Source/Platform
https://bugs.webkit.org/show_bug.cgi?id=74583
Modified: trunk/Source/Platform/Platform.gyp/Platform.gyp (104073 => 104074)
--- trunk/Source/Platform/Platform.gyp/Platform.gyp 2012-01-04 22:24:40 UTC (rev 104073)
+++ trunk/Source/Platform/Platform.gyp/Platform.gyp 2012-01-04 22:26:33 UTC (rev 104074)
@@ -34,7 +34,7 @@
],
'targets': [
{
- 'target_name': 'platform',
+ 'target_name': 'webkit_platform',
'type': 'static_library',
'dependencies': [
'../../_javascript_Core/_javascript_Core.gyp/_javascript_Core.gyp:wtf',
Modified: trunk/Source/WebKit/chromium/ChangeLog (104073 => 104074)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-01-04 22:24:40 UTC (rev 104073)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-01-04 22:26:33 UTC (rev 104074)
@@ -1,3 +1,9 @@
+2012-01-04 James Robinson <[email protected]>
+
+ [chromium] Compile fix, rename libplatform.a to libwebkit_platform.a to avoid collision with nacl
+
+ * WebKit.gyp:
+
2012-01-04 Sheriff Bot <[email protected]>
Unreviewed, rolling out r104052.
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (104073 => 104074)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-01-04 22:24:40 UTC (rev 104073)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-01-04 22:26:33 UTC (rev 104074)
@@ -67,7 +67,7 @@
'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
'../../WebCore/WebCore.gyp/WebCore.gyp:webcore',
- '../../Platform/Platform.gyp/Platform.gyp:platform', # actually WebCore should depend on this
+ '../../Platform/Platform.gyp/Platform.gyp:webkit_platform', # actually WebCore should depend on this
'<(chromium_src_dir)/skia/skia.gyp:skia',
'<(chromium_src_dir)/third_party/icu/icu.gyp:icuuc',
'<(chromium_src_dir)/third_party/npapi/npapi.gyp:npapi',
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
