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

Side by Side 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 unified diff | Download patch
« no previous file with comments | « ipc/ipc.gyp ('k') | net/net.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # Override to dynamically link the PulseAudio library. 8 # Override to dynamically link the PulseAudio library.
9 'use_pulseaudio%': 0, 9 'use_pulseaudio%': 0,
10 # Override to dynamically link the cras (ChromeOS audio) library. 10 # Override to dynamically link the cras (ChromeOS audio) library.
(...skipping 998 matching lines...) Expand 10 before | Expand all | Expand 10 after
1009 ], 1009 ],
1010 }], 1010 }],
1011 # Special target to wrap a gtest_target_type==shared_library 1011 # Special target to wrap a gtest_target_type==shared_library
1012 # media_unittests into an android apk for execution. 1012 # media_unittests into an android apk for execution.
1013 ['OS == "android" and gtest_target_type == "shared_library"', { 1013 ['OS == "android" and gtest_target_type == "shared_library"', {
1014 'targets': [ 1014 'targets': [
1015 { 1015 {
1016 'target_name': 'media_unittests_apk', 1016 'target_name': 'media_unittests_apk',
1017 'type': 'none', 1017 'type': 'none',
1018 'dependencies': [ 1018 'dependencies': [
1019 '../base/base.gyp:base_java',
1020 'media_java', 1019 'media_java',
1021 'media_unittests', 1020 'media_unittests',
1022 ], 1021 ],
1023 'variables': { 1022 'variables': {
1024 'test_suite_name': 'media_unittests', 1023 'test_suite_name': 'media_unittests',
1025 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)media_uni ttests<(SHARED_LIB_SUFFIX)', 1024 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)media_uni ttests<(SHARED_LIB_SUFFIX)',
1026 'input_jars_paths': [
1027 '<(PRODUCT_DIR)/lib.java/chromium_base.jar',
1028 '<(PRODUCT_DIR)/lib.java/chromium_media.jar',
1029 ],
1030 }, 1025 },
1031 'includes': [ '../build/apk_test.gypi' ], 1026 'includes': [ '../build/apk_test.gypi' ],
1032 }, 1027 },
1033 ], 1028 ],
1034 }], 1029 }],
1035 ['OS == "android"', { 1030 ['OS == "android"', {
1036 'targets': [ 1031 'targets': [
1037 { 1032 {
1038 'target_name': 'player_android_jni_headers', 1033 'target_name': 'player_android_jni_headers',
1039 'type': 'none', 1034 'type': 'none',
(...skipping 16 matching lines...) Expand all
1056 '../base/base.gyp:base', 1051 '../base/base.gyp:base',
1057 'player_android_jni_headers', 1052 'player_android_jni_headers',
1058 ], 1053 ],
1059 'include_dirs': [ 1054 'include_dirs': [
1060 '<(SHARED_INTERMEDIATE_DIR)/media', 1055 '<(SHARED_INTERMEDIATE_DIR)/media',
1061 ], 1056 ],
1062 }, 1057 },
1063 { 1058 {
1064 'target_name': 'media_java', 1059 'target_name': 'media_java',
1065 'type': 'none', 1060 'type': 'none',
1066 'dependencies': [ '../base/base.gyp:base_java' ], 1061 'dependencies': [
1062 '../base/base.gyp:base_java',
1063 ],
1064 'export_dependent_settings': [
1065 '../base/base.gyp:base_java',
1066 ],
1067 'variables': { 1067 'variables': {
1068 'package_name': 'media', 1068 'package_name': 'media',
1069 'java_in_dir': 'base/android/java', 1069 'java_in_dir': 'base/android/java',
1070 }, 1070 },
1071 'includes': [ '../build/java.gypi' ], 1071 'includes': [ '../build/java.gypi' ],
1072 }, 1072 },
1073 1073
1074 ], 1074 ],
1075 }, { # OS != "android"' 1075 }, { # OS != "android"'
1076 # Android does not use ffmpeg, so disable the targets which require it. 1076 # Android does not use ffmpeg, so disable the targets which require it.
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
1160 'media', 1160 'media',
1161 ], 1161 ],
1162 'sources': [ 1162 'sources': [
1163 'tools/media_bench/media_bench.cc', 1163 'tools/media_bench/media_bench.cc',
1164 ], 1164 ],
1165 }, 1165 },
1166 ], 1166 ],
1167 }] 1167 }]
1168 ], 1168 ],
1169 } 1169 }
OLDNEW
« 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