Title: [101846] trunk/Source/WebKit/chromium
- Revision
- 101846
- Author
- [email protected]
- Date
- 2011-12-02 13:49:17 -0800 (Fri, 02 Dec 2011)
Log Message
[Chromium] GYP fix for Windows 2010 build
https://bugs.webkit.org/show_bug.cgi?id=73483
Reviewed by Adam Barth.
Patch by Carlos Pizano.
* WebKit.gyp: Exclude the android directory and remove a file match that doesn't match anything.
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (101845 => 101846)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-12-02 21:42:32 UTC (rev 101845)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-12-02 21:49:17 UTC (rev 101846)
@@ -1,3 +1,14 @@
+2011-12-02 Tony Chang <[email protected]>
+
+ [Chromium] GYP fix for Windows 2010 build
+ https://bugs.webkit.org/show_bug.cgi?id=73483
+
+ Reviewed by Adam Barth.
+
+ Patch by Carlos Pizano.
+
+ * WebKit.gyp: Exclude the android directory and remove a file match that doesn't match anything.
+
2011-12-01 Alok Priyadarshi <[email protected]>
[chromium] CCLayerQuad does not return FloatQuad in correct order
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (101845 => 101846)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2011-12-02 21:42:32 UTC (rev 101845)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2011-12-02 21:49:17 UTC (rev 101846)
@@ -781,6 +781,10 @@
'include_dirs': [
'public/android',
],
+ }, { # else: OS!="android"
+ 'sources/': [
+ ['exclude', '/android/'],
+ ],
}],
['OS=="mac"', {
'include_dirs': [
@@ -1239,9 +1243,6 @@
'ImageDiff#host',
],
},{ # OS!="android"
- 'sources/': [
- ['exclude', '(Android)\\.cpp$']
- ],
'dependencies': [
'ImageDiff',
'copy_TestNetscapePlugIn',
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
