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

Side by Side Diff: media/media.gyp

Issue 10913083: Remove {base,net}_java dependencies from GYP client targets on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 8 years, 3 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 | Annotate | Revision Log
« 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 1141 matching lines...) Expand 10 before | Expand all | Expand 10 after
1152 'player_android_jni_headers', 1152 'player_android_jni_headers',
1153 ], 1153 ],
1154 'include_dirs': [ 1154 'include_dirs': [
1155 '<(SHARED_INTERMEDIATE_DIR)/media', 1155 '<(SHARED_INTERMEDIATE_DIR)/media',
1156 ], 1156 ],
1157 }, 1157 },
1158 { 1158 {
1159 'target_name': 'media_java', 1159 'target_name': 'media_java',
1160 'type': 'none', 1160 'type': 'none',
1161 'dependencies': [ 1161 'dependencies': [
1162 '../base/base.gyp:base_java', 1162 '../base/base.gyp:base',
1163 ], 1163 ],
1164 'export_dependent_settings': [ 1164 'export_dependent_settings': [
1165 '../base/base.gyp:base_java', 1165 '../base/base.gyp:base',
1166 ], 1166 ],
1167 'variables': { 1167 'variables': {
1168 'package_name': 'media', 1168 'package_name': 'media',
1169 'java_in_dir': 'base/android/java', 1169 'java_in_dir': 'base/android/java',
1170 }, 1170 },
1171 'includes': [ '../build/java.gypi' ], 1171 'includes': [ '../build/java.gypi' ],
1172 }, 1172 },
1173 1173
1174 ], 1174 ],
1175 }], 1175 }],
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
1262 'media', 1262 'media',
1263 ], 1263 ],
1264 'sources': [ 1264 'sources': [
1265 'tools/media_bench/media_bench.cc', 1265 'tools/media_bench/media_bench.cc',
1266 ], 1266 ],
1267 }, 1267 },
1268 ], 1268 ],
1269 }] 1269 }]
1270 ], 1270 ],
1271 } 1271 }
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