Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (122291 => 122292)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-07-11 04:24:22 UTC (rev 122291)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-07-11 04:32:34 UTC (rev 122292)
@@ -1,3 +1,16 @@
+2012-07-10 Adam Barth <[email protected]>
+
+ [Chromium-Android] Add apk test targets for webkit_unit_tests and TestWebKitAPI
+ https://bugs.webkit.org/show_bug.cgi?id=90918
+
+ Reviewed by Tony Chang.
+
+ The rules are similar to what we have added for DumpRenderTree apk.
+ All references to gtest_target_type can be removed once we enable APK
+ tests on the all bots.
+
+ * WebKitUnitTests.gyp:
+
2012-07-10 Kevin Ellis <[email protected]>
Input elements with type=range do not have default touch handlers.
Modified: trunk/Source/WebKit/chromium/WebKitUnitTests.gyp (122291 => 122292)
--- trunk/Source/WebKit/chromium/WebKitUnitTests.gyp 2012-07-11 04:24:22 UTC (rev 122291)
+++ trunk/Source/WebKit/chromium/WebKitUnitTests.gyp 2012-07-11 04:32:34 UTC (rev 122292)
@@ -113,6 +113,12 @@
},
},
}],
+ ['OS=="android" and gtest_target_type == "shared_library"', {
+ 'type': 'shared_library',
+ 'dependencies': [
+ '<(chromium_src_dir)/testing/android/native_test.gyp:native_test_native_code',
+ ],
+ }],
],
}
], # targets
@@ -124,5 +130,50 @@
'cflags_cc': ['-Wno-c++0x-compat'],
},
}],
+ ['OS=="android" and gtest_target_type == "shared_library"', {
+ # Wrap libwebkit_unit_tests.so into an android apk for execution.
+ 'targets': [{
+ 'target_name': 'webkit_unit_tests_apk',
+ 'type': 'none',
+ 'dependencies': [
+ '<(chromium_src_dir)/base/base.gyp:base_java',
+ 'webkit_unit_tests',
+ ],
+ 'variables': {
+ 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)webkit_unit_tests<(SHARED_LIB_SUFFIX)',
+ 'input_jars_paths': [
+ '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
+ ],
+ },
+ # 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
+ # conditions. And we also have some different requirements.
+ 'actions': [{
+ 'action_name': 'apk_webkit_unit_tests',
+ 'message': 'Building webkit_unit_tests test apk.',
+ 'inputs': [
+ '<(chromium_src_dir)/testing/android/AndroidManifest.xml',
+ '<(chromium_src_dir)/testing/android/generate_native_test.py',
+ '<(input_shlib_path)',
+ '<@(input_jars_paths)',
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/webkit_unit_tests_apk/webkit_unit_tests-debug.apk',
+ ],
+ 'action': [
+ '<(chromium_src_dir)/testing/android/generate_native_test.py',
+ '--native_library',
+ '<(input_shlib_path)',
+ '--jars',
+ '"<@(input_jars_paths)"',
+ '--output',
+ '<(PRODUCT_DIR)/webkit_unit_tests_apk',
+ '--ant-args',
+ '-DPRODUCT_DIR=<(ant_build_out)',
+ '--ant-compile=<(sdk_build)'
+ ],
+ }],
+ }],
+ }],
],
}
Modified: trunk/Tools/ChangeLog (122291 => 122292)
--- trunk/Tools/ChangeLog 2012-07-11 04:24:22 UTC (rev 122291)
+++ trunk/Tools/ChangeLog 2012-07-11 04:32:34 UTC (rev 122292)
@@ -1,3 +1,16 @@
+2012-07-10 Adam Barth <[email protected]>
+
+ [Chromium-Android] Add apk test targets for webkit_unit_tests and TestWebKitAPI
+ https://bugs.webkit.org/show_bug.cgi?id=90918
+
+ Reviewed by Tony Chang.
+
+ The rules are similar to what we have added for DumpRenderTree apk.
+ All references to gtest_target_type can be removed once we enable APK
+ tests on the all bots.
+
+ * TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp:
+
2012-07-10 Kenneth Russell <[email protected]>
Add --no-build option to perf test runner
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp (122291 => 122292)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp 2012-07-11 04:24:22 UTC (rev 122291)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp 2012-07-11 04:32:34 UTC (rev 122292)
@@ -82,8 +82,61 @@
'<(source_dir)/WebKit/chromium/src/ChromiumCurrentTime.cpp',
'<(source_dir)/WebKit/chromium/src/ChromiumThreading.cpp',
],
- }],
- ],
+ }],
+ ['OS=="android" and gtest_target_type == "shared_library"', {
+ 'type': 'shared_library',
+ 'dependencies': [
+ '<(chromium_src_dir)/testing/android/native_test.gyp:native_test_native_code',
+ ],
+ }],
+ ],
},
], # targets
+ 'conditions': [
+ ['OS=="android" and gtest_target_type == "shared_library"', {
+ # Wrap libTestWebKitAPI.so into an android apk for execution.
+ 'targets': [{
+ 'target_name': 'TestWebKitAPI_apk',
+ 'type': 'none',
+ 'dependencies': [
+ '<(chromium_src_dir)/base/base.gyp:base_java',
+ 'TestWebKitAPI',
+ ],
+ 'variables': {
+ 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)TestWebKitAPI<(SHARED_LIB_SUFFIX)',
+ 'input_jars_paths': [
+ '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
+ ],
+ },
+ # 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
+ # conditions. And we also have some different requirements.
+ 'actions': [{
+ 'action_name': 'apk_TestWebKitAPI',
+ 'message': 'Building TestWebKitAPI test apk.',
+ 'inputs': [
+ '<(chromium_src_dir)/testing/android/AndroidManifest.xml',
+ '<(chromium_src_dir)/testing/android/generate_native_test.py',
+ '<(input_shlib_path)',
+ '<@(input_jars_paths)',
+ ],
+ 'outputs': [
+ '<(PRODUCT_DIR)/TestWebKitAPI_apk/TestWebKitAPI-debug.apk',
+ ],
+ 'action': [
+ '<(chromium_src_dir)/testing/android/generate_native_test.py',
+ '--native_library',
+ '<(input_shlib_path)',
+ '--jars',
+ '"<@(input_jars_paths)"',
+ '--output',
+ '<(PRODUCT_DIR)/TestWebKitAPI_apk',
+ '--ant-args',
+ '-DPRODUCT_DIR=<(ant_build_out)',
+ '--ant-compile=<(sdk_build)'
+ ],
+ }],
+ }],
+ }],
+ ],
}
