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

Side by Side Diff: media/media.gyp

Issue 11308030: Use _target_name instead of package_name for java*.gypi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@apk_jar
Patch Set: Created 8 years, 1 month 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
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 1203 matching lines...) Expand 10 before | Expand all | Expand 10 after
1214 { 1214 {
1215 'target_name': 'media_java', 1215 'target_name': 'media_java',
1216 'type': 'none', 1216 'type': 'none',
1217 'dependencies': [ 1217 'dependencies': [
1218 '../base/base.gyp:base', 1218 '../base/base.gyp:base',
1219 ], 1219 ],
1220 'export_dependent_settings': [ 1220 'export_dependent_settings': [
1221 '../base/base.gyp:base', 1221 '../base/base.gyp:base',
1222 ], 1222 ],
1223 'variables': { 1223 'variables': {
1224 'package_name': 'media',
1225 'java_in_dir': 'base/android/java', 1224 'java_in_dir': 'base/android/java',
1226 }, 1225 },
1227 'includes': [ '../build/java.gypi' ], 1226 'includes': [ '../build/java.gypi' ],
1228 }, 1227 },
1229 1228
1230 ], 1229 ],
1231 }], 1230 }],
1232 ['OS != "android" and OS != "ios"', { 1231 ['OS != "android" and OS != "ios"', {
1233 # Android and iOS do not use ffmpeg, so disable the targets which require 1232 # Android and iOS do not use ffmpeg, so disable the targets which require
1234 # it. 1233 # it.
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
1318 'media', 1317 'media',
1319 ], 1318 ],
1320 'sources': [ 1319 'sources': [
1321 'tools/media_bench/media_bench.cc', 1320 'tools/media_bench/media_bench.cc',
1322 ], 1321 ],
1323 }, 1322 },
1324 ], 1323 ],
1325 }] 1324 }]
1326 ], 1325 ],
1327 } 1326 }
OLDNEW
« build/java.gypi ('K') | « content/content_tests.gypi ('k') | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698