Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3099)

Unified Diff: build/apk_test.gypi

Issue 11308351: Remove hardcoded chromium_*.jar paths (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 8 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « android_webview/android_webview_tests.gypi ('k') | testing/android/generate_native_test.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/apk_test.gypi
diff --git a/build/apk_test.gypi b/build/apk_test.gypi
index eefcbd7fd0df3c84f19b580361c1816c256283c7..0ea785c038252fb5769edc72f2f799b7777d47d4 100644
--- a/build/apk_test.gypi
+++ b/build/apk_test.gypi
@@ -19,12 +19,9 @@
#
{
- 'variables': {
- 'input_jars_paths': [
- # Needed by ChromeNativeTestActivity.java.
- '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
- ],
- },
+ 'dependencies': [
+ '<(DEPTH)/base/base.gyp:base_java',
+ ],
'target_conditions': [
['_toolset == "target"', {
'conditions': [
@@ -45,8 +42,6 @@
'<(DEPTH)/testing/android/generate_native_test.py',
'--native_library',
'<(input_shlib_path)',
- '--jars',
- '">@(input_jars_paths)"',
'--output',
'<(PRODUCT_DIR)/<(test_suite_name)_apk',
'--strip-binary=<(android_strip)',
@@ -66,6 +61,8 @@
'-DANDROID_GDBSERVER=<(android_gdbserver)',
'--ant-args',
'-DCHROMIUM_SRC=<(ant_build_out)/../..',
+ '--ant-args',
+ '-DINPUT_JARS_PATHS=>(input_jars_paths)',
],
}],
}], # 'OS == "android" and gtest_target_type == "shared_library"
« no previous file with comments | « android_webview/android_webview_tests.gypi ('k') | testing/android/generate_native_test.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698