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

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 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
« no previous file with comments | « content/content_tests.gypi ('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 1367 matching lines...) Expand 10 before | Expand all | Expand 10 after
1378 { 1378 {
1379 'target_name': 'media_java', 1379 'target_name': 'media_java',
1380 'type': 'none', 1380 'type': 'none',
1381 'dependencies': [ 1381 'dependencies': [
1382 '../base/base.gyp:base', 1382 '../base/base.gyp:base',
1383 ], 1383 ],
1384 'export_dependent_settings': [ 1384 'export_dependent_settings': [
1385 '../base/base.gyp:base', 1385 '../base/base.gyp:base',
1386 ], 1386 ],
1387 'variables': { 1387 'variables': {
1388 'package_name': 'media',
1389 'java_in_dir': 'base/android/java', 1388 'java_in_dir': 'base/android/java',
1390 }, 1389 },
1391 'includes': [ '../build/java.gypi' ], 1390 'includes': [ '../build/java.gypi' ],
1392 }, 1391 },
1393 1392
1394 ], 1393 ],
1395 }], 1394 }],
1396 ['OS != "android" and OS != "ios"', { 1395 ['OS != "android" and OS != "ios"', {
1397 # Android and iOS do not use ffmpeg, so disable the targets which require 1396 # Android and iOS do not use ffmpeg, so disable the targets which require
1398 # it. 1397 # it.
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
1508 ], 1507 ],
1509 'sources': [ 1508 'sources': [
1510 'video/capture/screen/differ_block_sse2.cc', 1509 'video/capture/screen/differ_block_sse2.cc',
1511 'video/capture/screen/differ_block_sse2.h', 1510 'video/capture/screen/differ_block_sse2.h',
1512 ], 1511 ],
1513 }, # end of target differ_block_sse2 1512 }, # end of target differ_block_sse2
1514 ], 1513 ],
1515 }], 1514 }],
1516 ], 1515 ],
1517 } 1516 }
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698