Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (139894 => 139895)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-16 18:32:46 UTC (rev 139894)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-16 18:37:48 UTC (rev 139895)
@@ -1,3 +1,18 @@
+2013-01-16 Chris Hopman <cjhop...@chromium.org>
+
+ [Chromium] Remove hardcoded chromium_*.jar in gyp files
+ https://bugs.webkit.org/show_bug.cgi?id=104049
+
+ Reviewed by Eric Seidel.
+
+ Targets with dependencies (direct/indirect) on a java target receive
+ the chromium_*.jar paths in the variable input_jars_paths. Targets
+ should use that rather than hardcoding where they think the jar will
+ be. These can be passed directly to ant as INPUT_JARS_PATHS rather
+ than as --jars to generate_native_test.py.
+
+ * WebKitUnitTests.gyp:
+
2013-01-16 Dominic Cooney <domin...@chromium.org>
[Chromium] Unreviewed gardening.
Modified: trunk/Source/WebKit/chromium/WebKitUnitTests.gyp (139894 => 139895)
--- trunk/Source/WebKit/chromium/WebKitUnitTests.gyp 2013-01-16 18:32:46 UTC (rev 139894)
+++ trunk/Source/WebKit/chromium/WebKitUnitTests.gyp 2013-01-16 18:37:48 UTC (rev 139895)
@@ -150,10 +150,6 @@
],
'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',
- '<(PRODUCT_DIR)/lib.java/chromium_net.jar',
- ],
'conditions': [
['inside_chromium_build==1', {
'ant_build_to_chromium_src': '<(ant_build_out)/../../',
@@ -181,8 +177,6 @@
'<(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',
'--strip-binary=<(android_strip)',
@@ -204,6 +198,8 @@
'-DPRODUCT_DIR=<(ant_build_out)',
'--ant-args',
'-DCHROMIUM_SRC=<(ant_build_to_chromium_src)',
+ '--ant-args',
+ '-DINPUT_JARS_PATHS=>@(input_jars_paths)',
'--app_abi',
'<(android_app_abi)',
],
Modified: trunk/Tools/ChangeLog (139894 => 139895)
--- trunk/Tools/ChangeLog 2013-01-16 18:32:46 UTC (rev 139894)
+++ trunk/Tools/ChangeLog 2013-01-16 18:37:48 UTC (rev 139895)
@@ -1,3 +1,19 @@
+2013-01-16 Chris Hopman <cjhop...@chromium.org>
+
+ [Chromium] Remove hardcoded chromium_*.jar in gyp files
+ https://bugs.webkit.org/show_bug.cgi?id=104049
+
+ Reviewed by Eric Seidel.
+
+ Targets with dependencies (direct/indirect) on a java target receive
+ the chromium_*.jar paths in the variable input_jars_paths. Targets
+ should use that rather than hardcoding where they think the jar will
+ be. These can be passed directly to ant as INPUT_JARS_PATHS rather
+ than as --jars to generate_native_test.py.
+
+ * DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:
+ * TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp:
+
2013-01-16 Dan Carney <dcar...@google.com>
[chromium] move setMockDeviceOrientation to TestRunner library
Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp (139894 => 139895)
--- trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2013-01-16 18:32:46 UTC (rev 139894)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp 2013-01-16 18:37:48 UTC (rev 139895)
@@ -472,11 +472,6 @@
],
'variables': {
'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)DumpRenderTree<(SHARED_LIB_SUFFIX)',
- 'input_jars_paths': [
- '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
- '<(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)/../../',
@@ -495,7 +490,7 @@
'<(chromium_src_dir)/testing/android/AndroidManifest.xml',
'<(chromium_src_dir)/testing/android/generate_native_test.py',
'<(input_shlib_path)',
- '<@(input_jars_paths)',
+ '>@(input_jars_paths)',
],
'outputs': [
'<(PRODUCT_DIR)/DumpRenderTree_apk/DumpRenderTree-debug.apk',
@@ -504,8 +499,6 @@
'<(chromium_src_dir)/testing/android/generate_native_test.py',
'--native_library',
'<(input_shlib_path)',
- '--jars',
- '"<@(input_jars_paths)"',
'--output',
'<(PRODUCT_DIR)/DumpRenderTree_apk',
'--strip-binary=<(android_strip)',
@@ -527,6 +520,8 @@
'-DPRODUCT_DIR=<(ant_build_out)',
'--ant-args',
'-DCHROMIUM_SRC=<(ant_build_to_chromium_src)',
+ '--ant-args',
+ '-DINPUT_JARS_PATHS=>@(input_jars_paths)',
'--app_abi',
'<(android_app_abi)',
],
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp (139894 => 139895)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp 2013-01-16 18:32:46 UTC (rev 139894)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.gyp/TestWebKitAPI.gyp 2013-01-16 18:37:48 UTC (rev 139895)
@@ -106,9 +106,6 @@
],
'variables': {
'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)TestWebKitAPI<(SHARED_LIB_SUFFIX)',
- 'input_jars_paths': [
- '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
- ],
'conditions': [
['inside_chromium_build==1', {
'ant_build_to_chromium_src': '<(ant_build_out)/../../',
@@ -127,7 +124,7 @@
'<(chromium_src_dir)/testing/android/AndroidManifest.xml',
'<(chromium_src_dir)/testing/android/generate_native_test.py',
'<(input_shlib_path)',
- '<@(input_jars_paths)',
+ '>@(input_jars_paths)',
],
'outputs': [
'<(PRODUCT_DIR)/TestWebKitAPI_apk/TestWebKitAPI-debug.apk',
@@ -136,8 +133,6 @@
'<(chromium_src_dir)/testing/android/generate_native_test.py',
'--native_library',
'<(input_shlib_path)',
- '--jars',
- '"<@(input_jars_paths)"',
'--output',
'<(PRODUCT_DIR)/TestWebKitAPI_apk',
'--strip-binary=<(android_strip)',
@@ -159,6 +154,8 @@
'-DPRODUCT_DIR=<(ant_build_out)',
'--ant-args',
'-DCHROMIUM_SRC=<(ant_build_to_chromium_src)',
+ '--ant-args',
+ '-DINPUT_JARS_PATHS=>@(input_jars_paths)',
'--app_abi',
'<(android_app_abi)',
],
