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

Unified Diff: media/media.gyp

Issue 10837143: Make java.gypi export jar path to input_jars_paths variable (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 4 months 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 | « ipc/ipc.gyp ('k') | net/net.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index d11e7501cb8ca85fc502974235d8245a53e78e7b..dfe151fbfa39219b326f59a0f7f4f7b1362ecf7c 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1016,17 +1016,12 @@
'target_name': 'media_unittests_apk',
'type': 'none',
'dependencies': [
- '../base/base.gyp:base_java',
'media_java',
'media_unittests',
],
'variables': {
'test_suite_name': 'media_unittests',
'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)media_unittests<(SHARED_LIB_SUFFIX)',
- 'input_jars_paths': [
- '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
- '<(PRODUCT_DIR)/lib.java/chromium_media.jar',
- ],
},
'includes': [ '../build/apk_test.gypi' ],
},
@@ -1063,7 +1058,12 @@
{
'target_name': 'media_java',
'type': 'none',
- 'dependencies': [ '../base/base.gyp:base_java' ],
+ 'dependencies': [
+ '../base/base.gyp:base_java',
+ ],
+ 'export_dependent_settings': [
+ '../base/base.gyp:base_java',
+ ],
'variables': {
'package_name': 'media',
'java_in_dir': 'base/android/java',
« no previous file with comments | « ipc/ipc.gyp ('k') | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698