Title: [102921] trunk/Source/WebKit/chromium
- Revision
- 102921
- Author
- [email protected]
- Date
- 2011-12-15 04:35:27 -0800 (Thu, 15 Dec 2011)
Log Message
[Chromium] Enable TestNetscapePlugIn to link for Android
https://bugs.webkit.org/show_bug.cgi?id=74597
Reviewed by Tony Gentilcore.
The -nostdlib linker flag is being passed to all targets being build
for Android, which conflicts with the shared library the
TestNetscapePlugIn target created. Explicitly exclude the flag.
* WebKit.gyp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (102920 => 102921)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-12-15 12:31:48 UTC (rev 102920)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-12-15 12:35:27 UTC (rev 102921)
@@ -1,3 +1,16 @@
+2011-12-15 Peter Beverloo <[email protected]>
+
+ [Chromium] Enable TestNetscapePlugIn to link for Android
+ https://bugs.webkit.org/show_bug.cgi?id=74597
+
+ Reviewed by Tony Gentilcore.
+
+ The -nostdlib linker flag is being passed to all targets being build
+ for Android, which conflicts with the shared library the
+ TestNetscapePlugIn target created. Explicitly exclude the flag.
+
+ * WebKit.gyp:
+
2011-12-14 David Levin <[email protected]>
[chromium] DatabaseObserver needs threadsafe fixes and other clean-up.
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (102920 => 102921)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2011-12-15 12:31:48 UTC (rev 102920)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2011-12-15 12:35:27 UTC (rev 102921)
@@ -1452,6 +1452,11 @@
'-fvisibility=default',
],
}],
+ ['OS=="android"', {
+ 'ldflags!': [
+ '-nostdlib',
+ ],
+ }],
['OS=="win"', {
'defines': [
# This seems like a hack, but this is what Safari Win does.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
