Changeset 122292 in webkit
- Timestamp:
- Jul 10, 2012 9:32:34 PM (12 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/chromium/ChangeLog
r122286 r122292 1 2012-07-10 Adam Barth <abarth@webkit.org> 2 3 [Chromium-Android] Add apk test targets for webkit_unit_tests and TestWebKitAPI 4 https://bugs.webkit.org/show_bug.cgi?id=90918 5 6 Reviewed by Tony Chang. 7 8 The rules are similar to what we have added for DumpRenderTree apk. 9 All references to gtest_target_type can be removed once we enable APK 10 tests on the all bots. 11 12 * WebKitUnitTests.gyp: 13 1 14 2012-07-10 Kevin Ellis <kevers@chromium.org> 2 15 -
trunk/Source/WebKit/chromium/WebKitUnitTests.gyp
r122171 r122292 114 114 }, 115 115 }], 116 ['OS=="android" and gtest_target_type == "shared_library"', { 117 'type': 'shared_library', 118 'dependencies': [ 119 '<(chromium_src_dir)/testing/android/native_test.gyp:native_test_native_code', 120 ], 121 }], 116 122 ], 117 123 } … … 125 131 }, 126 132 }], 133 ['OS=="android" and gtest_target_type == "shared_library"', { 134 # Wrap libwebkit_unit_tests.so into an android apk for execution. 135 'targets': [{ 136 'target_name': 'webkit_unit_tests_apk', 137 'type': 'none', 138 'dependencies': [ 139 '<(chromium_src_dir)/base/base.gyp:base_java', 140 'webkit_unit_tests', 141 ], 142 'variables': { 143 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)webkit_unit_tests<(SHARED_LIB_SUFFIX)', 144 'input_jars_paths': [ 145 '<(PRODUCT_DIR)/lib.java/chromium_base.jar', 146 ], 147 }, 148 # Part of the following was copied from <(chromium_src_dir)/build/apk_test.gpyi. 149 # Not including it because gyp include doesn't support variable in path or under 150 # conditions. And we also have some different requirements. 151 'actions': [{ 152 'action_name': 'apk_webkit_unit_tests', 153 'message': 'Building webkit_unit_tests test apk.', 154 'inputs': [ 155 '<(chromium_src_dir)/testing/android/AndroidManifest.xml', 156 '<(chromium_src_dir)/testing/android/generate_native_test.py', 157 '<(input_shlib_path)', 158 '<@(input_jars_paths)', 159 ], 160 'outputs': [ 161 '<(PRODUCT_DIR)/webkit_unit_tests_apk/webkit_unit_tests-debug.apk', 162 ], 163 'action': [ 164 '<(chromium_src_dir)/testing/android/generate_native_test.py', 165 '--native_library', 166 '<(input_shlib_path)', 167 '--jars', 168 '"<@(input_jars_paths)"', 169 '--output', 170 '<(PRODUCT_DIR)/webkit_unit_tests_apk', 171 '--ant-args', 172 '-DPRODUCT_DIR=<(ant_build_out)', 173 '--ant-compile=<(sdk_build)' 174 ], 175 }], 176 }], 177 }], 127 178 ], 128 179 } -
trunk/Tools/ChangeLog
r122289 r122292 1 2012-07-10 Adam Barth <abarth@webkit.org> 2 3 [Chromium-Android] Add apk test targets for webkit_unit_tests and TestWebKitAPI 4 https://bugs.webkit.org/show_bug.cgi?id=90918 5 6 Reviewed by Tony Chang. 7 8 The rules are similar to what we have added for DumpRenderTree apk. 9 All references to gtest_target_type can be removed once we enable APK 10 tests on the all bots. 11 12 * TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp: 13 1 14 2012-07-10 Kenneth Russell <kbr@google.com> 2 15 -
trunk/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp
r113231 r122292 83 83 '<(source_dir)/WebKit/chromium/src/ChromiumThreading.cpp', 84 84 ], 85 }], 86 ], 85 }], 86 ['OS=="android" and gtest_target_type == "shared_library"', { 87 'type': 'shared_library', 88 'dependencies': [ 89 '<(chromium_src_dir)/testing/android/native_test.gyp:native_test_native_code', 90 ], 91 }], 92 ], 87 93 }, 88 94 ], # targets 95 'conditions': [ 96 ['OS=="android" and gtest_target_type == "shared_library"', { 97 # Wrap libTestWebKitAPI.so into an android apk for execution. 98 'targets': [{ 99 'target_name': 'TestWebKitAPI_apk', 100 'type': 'none', 101 'dependencies': [ 102 '<(chromium_src_dir)/base/base.gyp:base_java', 103 'TestWebKitAPI', 104 ], 105 'variables': { 106 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)TestWebKitAPI<(SHARED_LIB_SUFFIX)', 107 'input_jars_paths': [ 108 '<(PRODUCT_DIR)/lib.java/chromium_base.jar', 109 ], 110 }, 111 # Part of the following was copied from <(chromium_src_dir)/build/apk_test.gpyi. 112 # Not including it because gyp include doesn't support variable in path or under 113 # conditions. And we also have some different requirements. 114 'actions': [{ 115 'action_name': 'apk_TestWebKitAPI', 116 'message': 'Building TestWebKitAPI test apk.', 117 'inputs': [ 118 '<(chromium_src_dir)/testing/android/AndroidManifest.xml', 119 '<(chromium_src_dir)/testing/android/generate_native_test.py', 120 '<(input_shlib_path)', 121 '<@(input_jars_paths)', 122 ], 123 'outputs': [ 124 '<(PRODUCT_DIR)/TestWebKitAPI_apk/TestWebKitAPI-debug.apk', 125 ], 126 'action': [ 127 '<(chromium_src_dir)/testing/android/generate_native_test.py', 128 '--native_library', 129 '<(input_shlib_path)', 130 '--jars', 131 '"<@(input_jars_paths)"', 132 '--output', 133 '<(PRODUCT_DIR)/TestWebKitAPI_apk', 134 '--ant-args', 135 '-DPRODUCT_DIR=<(ant_build_out)', 136 '--ant-compile=<(sdk_build)' 137 ], 138 }], 139 }], 140 }], 141 ], 89 142 }
Note: See TracChangeset
for help on using the changeset viewer.