Title: [145714] trunk
- Revision
- 145714
- Author
- mnaga...@chromium.org
- Date
- 2013-03-13 07:13:13 -0700 (Wed, 13 Mar 2013)
Log Message
[Chromium] Rename android_build_type to android_webview_build in .gyp files.
https://bugs.webkit.org/show_bug.cgi?id=112129
Reviewed by Adam Barth.
Following Chromium
http://src.chromium.org/viewvc/chrome?view=rev&revision=187556
this is being renamed to better explain what it does.
Source/WebKit/chromium:
* WebKitUnitTests.gyp:
Tools:
* DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (145713 => 145714)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-03-13 13:52:39 UTC (rev 145713)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-03-13 14:13:13 UTC (rev 145714)
@@ -1,3 +1,16 @@
+2013-03-13 Mikhail Naganov <mnaga...@chromium.org>
+
+ [Chromium] Rename android_build_type to android_webview_build in .gyp files.
+ https://bugs.webkit.org/show_bug.cgi?id=112129
+
+ Reviewed by Adam Barth.
+
+ Following Chromium
+ http://src.chromium.org/viewvc/chrome?view=rev&revision=187556
+ this is being renamed to better explain what it does.
+
+ * WebKitUnitTests.gyp:
+
2013-03-13 Pavel Feldman <pfeld...@chromium.org>
Web Inspector: convert workers inspection into capability
Modified: trunk/Source/WebKit/chromium/WebKitUnitTests.gyp (145713 => 145714)
--- trunk/Source/WebKit/chromium/WebKitUnitTests.gyp 2013-03-13 13:52:39 UTC (rev 145713)
+++ trunk/Source/WebKit/chromium/WebKitUnitTests.gyp 2013-03-13 14:13:13 UTC (rev 145714)
@@ -144,7 +144,7 @@
'cflags_cc': ['-Wno-c++0x-compat'],
},
}],
- ['OS=="android" and android_build_type==0 and gtest_target_type == "shared_library"', {
+ ['OS=="android" and android_webview_build==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',
Modified: trunk/Tools/ChangeLog (145713 => 145714)
--- trunk/Tools/ChangeLog 2013-03-13 13:52:39 UTC (rev 145713)
+++ trunk/Tools/ChangeLog 2013-03-13 14:13:13 UTC (rev 145714)
@@ -1,3 +1,16 @@
+2013-03-13 Mikhail Naganov <mnaga...@chromium.org>
+
+ [Chromium] Rename android_build_type to android_webview_build in .gyp files.
+ https://bugs.webkit.org/show_bug.cgi?id=112129
+
+ Reviewed by Adam Barth.
+
+ Following Chromium
+ http://src.chromium.org/viewvc/chrome?view=rev&revision=187556
+ this is being renamed to better explain what it does.
+
+ * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
+
2013-03-13 Simon Hausmann <simon.hausm...@digia.com>
[Qt] Unreviewed trivial typo fix
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp (145713 => 145714)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2013-03-13 13:52:39 UTC (rev 145713)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2013-03-13 14:13:13 UTC (rev 145714)
@@ -69,12 +69,12 @@
'<(tools_dir)/DumpRenderTree/chromium/ImageDiff.cpp',
],
'conditions': [
- ['OS=="android" and android_build_type==0', {
+ ['OS=="android" and android_webview_build==0', {
# The Chromium Android port will compare images on host rather
# than target (a device or emulator) for performance reasons.
'toolsets': ['host'],
}],
- ['OS=="android" and android_build_type!=0', {
+ ['OS=="android" and android_webview_build==1', {
'type': 'none',
}],
],
@@ -219,7 +219,7 @@
]
}],
}],
- ['OS=="android" and android_build_type==0', {
+ ['OS=="android" and android_webview_build==0', {
'dependencies': [
'ImageDiff#host',
],
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
