Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (125537 => 125538)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-14 10:24:07 UTC (rev 125537)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-14 11:02:21 UTC (rev 125538)
@@ -1,3 +1,16 @@
+2012-08-14 Peter Beverloo <pe...@chromium.org>
+
+ [Chromium] Fix apk generation for the Android platform
+ https://bugs.webkit.org/show_bug.cgi?id=93841
+
+ Unreviewed build fix.
+
+ 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 Tom Sepez <tse...@chromium.org>
[chromium] release FrameLoaderClientImpl::m_pluginWidget refptr upon Plugin Document detach.
Modified: trunk/Source/WebKit/chromium/WebKitUnitTests.gyp (125537 => 125538)
--- trunk/Source/WebKit/chromium/WebKitUnitTests.gyp 2012-08-14 10:24:07 UTC (rev 125537)
+++ trunk/Source/WebKit/chromium/WebKitUnitTests.gyp 2012-08-14 11:02:21 UTC (rev 125538)
@@ -147,6 +147,13 @@
'input_jars_paths': [
'<(PRODUCT_DIR)/lib.java/chromium_base.jar',
],
+ 'conditions': [
+ ['inside_chromium_build==1', {
+ 'ant_build_to_chromium_src': '<(ant_build_out)/../../',
+ }, {
+ 'ant_build_to_chromium_src': '<(chromium_src_dir)',
+ }],
+ ],
},
# Part of the following was copied from <(chromium_src_dir)/build/apk_test.gpyi.
# Not including it because gyp include doesn't support variable in path or under
@@ -183,6 +190,8 @@
'-DANDROID_TOOLCHAIN=<(android_toolchain)',
'--ant-args',
'-DPRODUCT_DIR=<(ant_build_out)',
+ '--ant-args',
+ '-DCHROMIUM_SRC=<(ant_build_to_chromium_src)',
'--sdk-build=<(sdk_build)',
'--app_abi',
'<(android_app_abi)',
Modified: trunk/Tools/ChangeLog (125537 => 125538)
--- trunk/Tools/ChangeLog 2012-08-14 10:24:07 UTC (rev 125537)
+++ trunk/Tools/ChangeLog 2012-08-14 11:02:21 UTC (rev 125538)
@@ -1,3 +1,17 @@
+2012-08-14 Peter Beverloo <pe...@chromium.org>
+
+ [Chromium] Fix apk generation for the Android platform
+ https://bugs.webkit.org/show_bug.cgi?id=93841
+
+ Unreviewed build fix.
+
+ 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-14 Sergio Villar Senin <svil...@igalia.com>
[GTK] REGRESSION (r122428) WebKit2APITests/TestWebKitFindController fails "next" test
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp (125537 => 125538)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-08-14 10:24:07 UTC (rev 125537)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-08-14 11:02:21 UTC (rev 125538)
@@ -464,6 +464,13 @@
'<(PRODUCT_DIR)/lib.java/chromium_net.jar',
'<(PRODUCT_DIR)/lib.java/chromium_media.jar',
],
+ 'conditions': [
+ ['inside_chromium_build==1', {
+ 'ant_build_to_chromium_src': '<(ant_build_out)/../../',
+ }, {
+ 'ant_build_to_chromium_src': '<(chromium_src_dir)',
+ }],
+ ],
},
# Part of the following was copied from <(chromium_src_dir)/build/apk_test.gpyi.
# Not including it because gyp include doesn't support variable in path or under
@@ -500,6 +507,8 @@
'-DANDROID_TOOLCHAIN=<(android_toolchain)',
'--ant-args',
'-DPRODUCT_DIR=<(ant_build_out)',
+ '--ant-args',
+ '-DCHROMIUM_SRC=<(ant_build_to_chromium_src)',
'--sdk-build=<(sdk_build)',
'--app_abi',
'<(android_app_abi)',
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp (125537 => 125538)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp 2012-08-14 10:24:07 UTC (rev 125537)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp 2012-08-14 11:02:21 UTC (rev 125538)
@@ -107,6 +107,13 @@
'input_jars_paths': [
'<(PRODUCT_DIR)/lib.java/chromium_base.jar',
],
+ 'conditions': [
+ ['inside_chromium_build==1', {
+ 'ant_build_to_chromium_src': '<(ant_build_out)/../../',
+ }, {
+ 'ant_build_to_chromium_src': '<(chromium_src_dir)',
+ }],
+ ],
},
# Part of the following was copied from <(chromium_src_dir)/build/apk_test.gpyi.
# Not including it because gyp include doesn't support variable in path or under
@@ -143,6 +150,8 @@
'-DANDROID_TOOLCHAIN=<(android_toolchain)',
'--ant-args',
'-DPRODUCT_DIR=<(ant_build_out)',
+ '--ant-args',
+ '-DCHROMIUM_SRC=<(ant_build_to_chromium_src)',
'--sdk-build=<(sdk_build)',
'--app_abi',
'<(android_app_abi)',
