- Revision
- 124676
- Author
- [email protected]
- Date
- 2012-08-03 17:31:32 -0700 (Fri, 03 Aug 2012)
Log Message
[Chrome-Android] - Prepare apk tests for switch to checked in SDK.
https://bugs.webkit.org/show_bug.cgi?id=92931
Patch by Yaron Friedman <[email protected]> on 2012-08-03
Reviewed by Adam Barth.
Source/WebKit/chromium:
Pass Android-specific gyp variables to the native test generator
avoiding any dependencies on environment variables during build time.
* WebKitUnitTests.gyp:
Tools:
Pass Android-specific gyp variables to the native test generator,
avoiding any dependencies on environment variables during build time.
* DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
* TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (124675 => 124676)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-04 00:28:25 UTC (rev 124675)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-04 00:31:32 UTC (rev 124676)
@@ -1,3 +1,15 @@
+2012-08-03 Yaron Friedman <[email protected]>
+
+ [Chrome-Android] - Prepare apk tests for switch to checked in SDK.
+ https://bugs.webkit.org/show_bug.cgi?id=92931
+
+ Reviewed by Adam Barth.
+
+ Pass Android-specific gyp variables to the native test generator
+ avoiding any dependencies on environment variables during build time.
+
+ * WebKitUnitTests.gyp:
+
2012-08-03 David Grogan <[email protected]>
IndexedDB: Core upgradeneeded logic
Modified: trunk/Source/WebKit/chromium/WebKitUnitTests.gyp (124675 => 124676)
--- trunk/Source/WebKit/chromium/WebKitUnitTests.gyp 2012-08-04 00:28:25 UTC (rev 124675)
+++ trunk/Source/WebKit/chromium/WebKitUnitTests.gyp 2012-08-04 00:31:32 UTC (rev 124676)
@@ -172,6 +172,16 @@
'--output',
'<(PRODUCT_DIR)/webkit_unit_tests_apk',
'--ant-args',
+ '-DANDROID_SDK=<(android_sdk)',
+ '--ant-args',
+ '-DANDROID_SDK_ROOT=<(android_sdk_root)',
+ '--ant-args',
+ '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
+ '--ant-args',
+ '-DANDROID_SDK_VERSION=<(android_sdk_version)',
+ '--ant-args',
+ '-DANDROID_TOOLCHAIN=<(android_toolchain)',
+ '--ant-args',
'-DPRODUCT_DIR=<(ant_build_out)',
'--sdk-build=<(sdk_build)',
'--app_abi',
Modified: trunk/Tools/ChangeLog (124675 => 124676)
--- trunk/Tools/ChangeLog 2012-08-04 00:28:25 UTC (rev 124675)
+++ trunk/Tools/ChangeLog 2012-08-04 00:31:32 UTC (rev 124676)
@@ -1,3 +1,16 @@
+2012-08-03 Yaron Friedman <[email protected]>
+
+ [Chrome-Android] - Prepare apk tests for switch to checked in SDK.
+ https://bugs.webkit.org/show_bug.cgi?id=92931
+
+ Reviewed by Adam Barth.
+
+ Pass Android-specific gyp variables to the native test generator,
+ avoiding any dependencies on environment variables during build time.
+
+ * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
+ * TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp:
+
2012-08-03 Rick Byers <[email protected]>
Double tap gesture should send dblclick event
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp (124675 => 124676)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-08-04 00:28:25 UTC (rev 124675)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2012-08-04 00:31:32 UTC (rev 124676)
@@ -488,6 +488,16 @@
'--output',
'<(PRODUCT_DIR)/DumpRenderTree_apk',
'--ant-args',
+ '-DANDROID_SDK=<(android_sdk)',
+ '--ant-args',
+ '-DANDROID_SDK_ROOT=<(android_sdk_root)',
+ '--ant-args',
+ '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
+ '--ant-args',
+ '-DANDROID_SDK_VERSION=<(android_sdk_version)',
+ '--ant-args',
+ '-DANDROID_TOOLCHAIN=<(android_toolchain)',
+ '--ant-args',
'-DPRODUCT_DIR=<(ant_build_out)',
'--sdk-build=<(sdk_build)',
'--app_abi',
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp (124675 => 124676)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp 2012-08-04 00:28:25 UTC (rev 124675)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp 2012-08-04 00:31:32 UTC (rev 124676)
@@ -132,6 +132,16 @@
'--output',
'<(PRODUCT_DIR)/TestWebKitAPI_apk',
'--ant-args',
+ '-DANDROID_SDK=<(android_sdk)',
+ '--ant-args',
+ '-DANDROID_SDK_ROOT=<(android_sdk_root)',
+ '--ant-args',
+ '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
+ '--ant-args',
+ '-DANDROID_SDK_VERSION=<(android_sdk_version)',
+ '--ant-args',
+ '-DANDROID_TOOLCHAIN=<(android_toolchain)',
+ '--ant-args',
'-DPRODUCT_DIR=<(ant_build_out)',
'--sdk-build=<(sdk_build)',
'--app_abi',
