Title: [139963] trunk/Source/WebKit/chromium
- Revision
- 139963
- Author
- commit-qu...@webkit.org
- Date
- 2013-01-16 21:16:27 -0800 (Wed, 16 Jan 2013)
Log Message
Fix build break for Android webview.
https://bugs.webkit.org/show_bug.cgi?id=107072
Patch by Kristian Monsen <kristi...@google.com> on 2013-01-16
Reviewed by Steve Block.
Add extra guards when checking for OS=="Android" to make sure it is not included
for webview.
* WebKitUnitTests.gyp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (139962 => 139963)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-17 05:13:00 UTC (rev 139962)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-17 05:16:27 UTC (rev 139963)
@@ -1,3 +1,15 @@
+2013-01-16 Kristian Monsen <kristi...@google.com>
+
+ Fix build break for Android webview.
+ https://bugs.webkit.org/show_bug.cgi?id=107072
+
+ Reviewed by Steve Block.
+
+ Add extra guards when checking for OS=="Android" to make sure it is not included
+ for webview.
+
+ * WebKitUnitTests.gyp:
+
2013-01-16 Dominic Cooney <domin...@chromium.org>
[Chromium] Unreviewed gardening.
Modified: trunk/Source/WebKit/chromium/WebKitUnitTests.gyp (139962 => 139963)
--- trunk/Source/WebKit/chromium/WebKitUnitTests.gyp 2013-01-17 05:13:00 UTC (rev 139962)
+++ trunk/Source/WebKit/chromium/WebKitUnitTests.gyp 2013-01-17 05:16:27 UTC (rev 139963)
@@ -138,7 +138,7 @@
'cflags_cc': ['-Wno-c++0x-compat'],
},
}],
- ['OS=="android" and gtest_target_type == "shared_library"', {
+ ['OS=="android" and android_build_type==0 and gtest_target_type == "shared_library"', {
# Wrap libwebkit_unit_tests.so into an android apk for execution.
'targets': [{
'target_name': 'webkit_unit_tests_apk',
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
