Title: [125422] trunk
- Revision
- 125422
- Author
- [email protected]
- Date
- 2012-08-13 09:40:45 -0700 (Mon, 13 Aug 2012)
Log Message
[Chromium] Fix apk generation for the Android platform
https://bugs.webkit.org/show_bug.cgi?id=93841
Reviewed by Dimitri Glazkov.
APK generation was broken as the configuration file assumed compilation
would only occur in the Chromium tree. Pass the path to Chromium's source
base directory as a property to ant.
Source/WebKit/chromium:
* WebKitUnitTests.gyp:
Tools:
* DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
* TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (125421 => 125422)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-13 16:36:43 UTC (rev 125421)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-13 16:40:45 UTC (rev 125422)
@@ -1,5 +1,18 @@
2012-08-13 Peter Beverloo <[email protected]>
+ [Chromium] Fix apk generation for the Android platform
+ https://bugs.webkit.org/show_bug.cgi?id=93841
+
+ Reviewed by Dimitri Glazkov.
+
+ APK generation was broken as the configuration file assumed compilation
+ would only occur in the Chromium tree. Pass the path to Chromium's source
+ base directory as a property to ant.
+
+ * WebKitUnitTests.gyp:
+
+2012-08-13 Peter Beverloo <[email protected]>
+
Unreviewed. Rolled DEPS.
* DEPS:
Modified: trunk/Source/WebKit/chromium/WebKitUnitTests.gyp (125421 => 125422)
--- trunk/Source/WebKit/chromium/WebKitUnitTests.gyp 2012-08-13 16:36:43 UTC (rev 125421)
+++ trunk/Source/WebKit/chromium/WebKitUnitTests.gyp 2012-08-13 16:40:45 UTC (rev 125422)
@@ -183,6 +183,8 @@
'-DANDROID_TOOLCHAIN=<(android_toolchain)',
'--ant-args',
'-DPRODUCT_DIR=<(ant_build_out)',
+ '--ant-args',
+ '-DCHROMIUM_SRC=<(chromium_src_dir)',
'--sdk-build=<(sdk_build)',
'--app_abi',
'<(android_app_abi)',
Modified: trunk/Tools/ChangeLog (125421 => 125422)
--- trunk/Tools/ChangeLog 2012-08-13 16:36:43 UTC (rev 125421)
+++ trunk/Tools/ChangeLog 2012-08-13 16:40:45 UTC (rev 125422)
@@ -1,3 +1,17 @@
+2012-08-13 Peter Beverloo <[email protected]>
+
+ [Chromium] Fix apk generation for the Android platform
+ https://bugs.webkit.org/show_bug.cgi?id=93841
+
+ Reviewed by Dimitri Glazkov.
+
+ APK generation was broken as the configuration file assumed compilation
+ would only occur in the Chromium tree. Pass the path to Chromium's source
+ base directory as a property to ant.
+
+ * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
+ * TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp:
+
2012-08-13 Mikhail Pozdnyakov <[email protected]>
[WK2] [WTR] InjectedBundlePage::didFailLoadForResource invokes wrong callback
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp (125421 => 125422)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-08-13 16:36:43 UTC (rev 125421)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-08-13 16:40:45 UTC (rev 125422)
@@ -500,6 +500,8 @@
'-DANDROID_TOOLCHAIN=<(android_toolchain)',
'--ant-args',
'-DPRODUCT_DIR=<(ant_build_out)',
+ '--ant-args',
+ '-DCHROMIUM_SRC=<(chromium_src_dir)',
'--sdk-build=<(sdk_build)',
'--app_abi',
'<(android_app_abi)',
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp (125421 => 125422)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp 2012-08-13 16:36:43 UTC (rev 125421)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp 2012-08-13 16:40:45 UTC (rev 125422)
@@ -143,6 +143,8 @@
'-DANDROID_TOOLCHAIN=<(android_toolchain)',
'--ant-args',
'-DPRODUCT_DIR=<(ant_build_out)',
+ '--ant-args',
+ '-DCHROMIUM_SRC=<(chromium_src_dir)',
'--sdk-build=<(sdk_build)',
'--app_abi',
'<(android_app_abi)',
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
