From 4afef6e27ecbcf6430c5d37881eca04c6b1f8d78 Mon Sep 17 00:00:00 2001 From: "cjhopman@chromium.org" Date: Wed, 5 Dec 2012 02:32:23 +0000 Subject: Remove hardcoded chromium_*.jar paths 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. Change native_test_apk.xml to build with a list of jars in INPUT_JARS_PATHS rather than using all jars in a specific output directory. Make generate_native_test.py pass the --jars argument to ant with -DINPUT_JARS_PATHS. This supports those targets (WebKit) that are not updated to pass the ant-arg directly. BUG= Review URL: https://chromiumcodereview.appspot.com/11308351 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@171131 0039d316-1c4b-4281-b951-d872f2087c98 --- android_webview/android_webview_tests.gypi | 1 - 1 file changed, 1 deletion(-) (limited to 'android_webview') diff --git a/android_webview/android_webview_tests.gypi b/android_webview/android_webview_tests.gypi index 2dce67f..5cd4c12a 100644 --- a/android_webview/android_webview_tests.gypi +++ b/android_webview/android_webview_tests.gypi @@ -88,7 +88,6 @@ 'variables': { 'test_suite_name': 'android_webview_unittests', 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)android_webview_unittests<(SHARED_LIB_SUFFIX)', - 'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_android_webview_unittest_java.jar'], }, 'includes': [ '../build/apk_test.gypi' ], }, -- cgit v1.1