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

Unified Diff: testing/android/native_test.gyp

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 | « testing/android/generate_native_test.py ('k') | testing/android/native_test_apk.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/android/native_test.gyp
diff --git a/testing/android/native_test.gyp b/testing/android/native_test.gyp
index 3a9a7d57a5a701290a811230386fbaafcee5e313..80fe486ccec244c19e25e2f97c1c1b5253203601 100644
--- a/testing/android/native_test.gyp
+++ b/testing/android/native_test.gyp
@@ -12,20 +12,15 @@
'type': 'none',
'dependencies': [
'native_test_native_code',
+ '<(DEPTH)/base/base.gyp:base_java',
],
'actions': [
{
- 'action_name': 'copy_base_jar',
- 'inputs': ['<(PRODUCT_DIR)/lib.java/chromium_base.jar'],
- 'outputs': ['<(PRODUCT_DIR)/replaceme_apk/java/libs/chromium_base.jar'],
- 'action': ['cp', '<@(_inputs)', '<@(_outputs)'],
- },
- {
'action_name': 'native_test_apk',
'inputs': [
'<(DEPTH)/testing/android/native_test_apk.xml',
'<!@(find <(DEPTH)/testing/android -name "*.java")',
- '<(PRODUCT_DIR)/replaceme_apk/java/libs/chromium_base.jar',
+ '>@(input_jars_paths)',
'native_test_launcher.cc'
],
'outputs': [
@@ -48,6 +43,7 @@
'-DANDROID_SDK_VERSION=<(android_sdk_version)',
'-DANDROID_GDBSERVER=<(android_gdbserver)',
'-DCHROMIUM_SRC=<(ant_build_out)/../..',
+ '-DINPUT_JARS_PATHS=>(input_jars_paths)',
'-buildfile',
'<(DEPTH)/testing/android/native_test_apk.xml',
]
« no previous file with comments | « testing/android/generate_native_test.py ('k') | testing/android/native_test_apk.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698