Title: [126729] trunk/Source/WebKit/chromium
- Revision
- 126729
- Author
- [email protected]
- Date
- 2012-08-27 00:04:24 -0700 (Mon, 27 Aug 2012)
Log Message
[Chromium-Android]Move webkit_unit_tests_apk and TestWebKitAPI_apk into a
condition block:['OS=="android" and gtest_target_type == "shared_library"'].
https://bugs.webkit.org/show_bug.cgi?id=95049
Reviewed by Adam Barth.
Move webkit_unit_tests_apk and TestWebKitAPI_apk into block of gtest_target_type == "shared_library"
* All.gyp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/All.gyp (126728 => 126729)
--- trunk/Source/WebKit/chromium/All.gyp 2012-08-27 06:52:43 UTC (rev 126728)
+++ trunk/Source/WebKit/chromium/All.gyp 2012-08-27 07:04:24 UTC (rev 126729)
@@ -47,8 +47,15 @@
'conditions': [
['OS=="android"', {
'dependencies': [
+ '../../../Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:DumpRenderTree_apk',
+ ],
+ }],
+ # Special target to wrap a gtest_target_type==shared_library
+ # webkit_unit_tests and TestWebKitAPI into an android apk for
+ # execution. See base.gyp for TODO(jrg)s about this strategy.
+ ['OS=="android" and gtest_target_type == "shared_library"', {
+ 'dependencies': [
'WebKitUnitTests.gyp:webkit_unit_tests_apk',
- '../../../Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:DumpRenderTree_apk',
'../../../Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp:TestWebKitAPI_apk',
],
}],
Modified: trunk/Source/WebKit/chromium/ChangeLog (126728 => 126729)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-27 06:52:43 UTC (rev 126728)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-27 07:04:24 UTC (rev 126729)
@@ -1,3 +1,15 @@
+2012-08-27 Johnny Ding <[email protected]>
+
+ [Chromium-Android]Move webkit_unit_tests_apk and TestWebKitAPI_apk into a
+ condition block:['OS=="android" and gtest_target_type == "shared_library"'].
+ https://bugs.webkit.org/show_bug.cgi?id=95049
+
+ Reviewed by Adam Barth.
+
+ Move webkit_unit_tests_apk and TestWebKitAPI_apk into block of gtest_target_type == "shared_library"
+
+ * All.gyp:
+
2012-08-24 Dominic Mazzoni <[email protected]>
Chromium: WebAccessibilityObject should expose updateBackingStore
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
