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

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: And fix android_webview_test_apk Created 7 years, 10 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
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 1337 matching lines...) Expand 10 before | Expand all | Expand 10 after
1348 { 1348 {
1349 'target_name': 'media_java', 1349 'target_name': 'media_java',
1350 'type': 'none', 1350 'type': 'none',
1351 'dependencies': [ 1351 'dependencies': [
1352 '../base/base.gyp:base', 1352 '../base/base.gyp:base',
1353 ], 1353 ],
1354 'export_dependent_settings': [ 1354 'export_dependent_settings': [
1355 '../base/base.gyp:base', 1355 '../base/base.gyp:base',
1356 ], 1356 ],
1357 'variables': { 1357 'variables': {
1358 'package_name': 'media',
1359 'java_in_dir': 'base/android/java', 1358 'java_in_dir': 'base/android/java',
1360 }, 1359 },
1361 'includes': [ '../build/java.gypi' ], 1360 'includes': [ '../build/java.gypi' ],
1362 }, 1361 },
1363 1362
1364 ], 1363 ],
1365 }], 1364 }],
1366 ['OS != "android" and OS != "ios"', { 1365 ['OS != "android" and OS != "ios"', {
1367 # Android and iOS do not use ffmpeg, so disable the targets which require 1366 # Android and iOS do not use ffmpeg, so disable the targets which require
1368 # it. 1367 # it.
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
1474 ], 1473 ],
1475 'sources': [ 1474 'sources': [
1476 'video/capture/screen/differ_block_sse2.cc', 1475 'video/capture/screen/differ_block_sse2.cc',
1477 'video/capture/screen/differ_block_sse2.h', 1476 'video/capture/screen/differ_block_sse2.h',
1478 ], 1477 ],
1479 }, # end of target differ_block_sse2 1478 }, # end of target differ_block_sse2
1480 ], 1479 ],
1481 }], 1480 }],
1482 ], 1481 ],
1483 } 1482 }
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