[Chromium] Fix apk generation for the Android platform
authorpeter@chromium.org <peter@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 13 Aug 2012 16:40:45 +0000 (16:40 +0000)
committerpeter@chromium.org <peter@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 13 Aug 2012 16:40:45 +0000 (16:40 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@125422 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/WebKitUnitTests.gyp
Tools/ChangeLog
Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp
Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp

index d3fba35..3179b73 100644 (file)
@@ -1,5 +1,18 @@
 2012-08-13  Peter Beverloo  <peter@chromium.org>
 
+        [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  <peter@chromium.org>
+
         Unreviewed.  Rolled DEPS.
 
         * DEPS:
index b05a552..802de7f 100644 (file)
                         '-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)',
index a6ae1b3..e463ec0 100644 (file)
@@ -1,3 +1,17 @@
+2012-08-13  Peter Beverloo  <peter@chromium.org>
+
+        [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  <mikhail.pozdnyakov@intel.com>
 
         [WK2] [WTR] InjectedBundlePage::didFailLoadForResource invokes wrong callback
index f047083..5a56116 100644 (file)
                         '-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)',
index e84386f..f85423d 100644 (file)
                         '-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)',