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

Side by Side Diff: media/media.gyp

Issue 12524008: Android: factor out use of SDK jar. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove input_jar_file altogether. Created 7 years, 9 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 | « content/content.gyp ('k') | webkit/glue/webkit_glue.gypi » ('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 cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 'conditions': [ 10 'conditions': [
(...skipping 1381 matching lines...) Expand 10 before | Expand all | Expand 10 after
1392 ], 1392 ],
1393 }], 1393 }],
1394 ['OS == "android"', { 1394 ['OS == "android"', {
1395 'targets': [ 1395 'targets': [
1396 { 1396 {
1397 'target_name': 'media_player_jni_headers', 1397 'target_name': 'media_player_jni_headers',
1398 'type': 'none', 1398 'type': 'none',
1399 'variables': { 1399 'variables': {
1400 'jni_gen_package': 'media', 1400 'jni_gen_package': 'media',
1401 'input_java_class': 'android/media/MediaPlayer.class', 1401 'input_java_class': 'android/media/MediaPlayer.class',
1402 'input_jar_file': '<(android_sdk)/android.jar',
1403 }, 1402 },
1404 'includes': [ '../build/jar_file_jni_generator.gypi' ], 1403 'includes': [ '../build/jar_file_jni_generator.gypi' ],
1405 }, 1404 },
1406 { 1405 {
1407 'target_name': 'player_android_jni_headers', 1406 'target_name': 'player_android_jni_headers',
1408 'type': 'none', 1407 'type': 'none',
1409 'dependencies': [ 1408 'dependencies': [
1410 'media_player_jni_headers', 1409 'media_player_jni_headers',
1411 ], 1410 ],
1412 'sources': [ 1411 'sources': [
(...skipping 15 matching lines...) Expand all
1428 'jni_gen_package': 'media', 1427 'jni_gen_package': 'media',
1429 }, 1428 },
1430 'includes': [ '../build/jni_generator.gypi' ], 1429 'includes': [ '../build/jni_generator.gypi' ],
1431 }, 1430 },
1432 { 1431 {
1433 'target_name': 'media_codec_jni_headers', 1432 'target_name': 'media_codec_jni_headers',
1434 'type': 'none', 1433 'type': 'none',
1435 'variables': { 1434 'variables': {
1436 'jni_gen_package': 'media', 1435 'jni_gen_package': 'media',
1437 'input_java_class': 'android/media/MediaCodec.class', 1436 'input_java_class': 'android/media/MediaCodec.class',
1438 'input_jar_file': '<(android_sdk)/android.jar',
1439 }, 1437 },
1440 'includes': [ '../build/jar_file_jni_generator.gypi' ], 1438 'includes': [ '../build/jar_file_jni_generator.gypi' ],
1441 }, 1439 },
1442 { 1440 {
1443 'target_name': 'media_format_jni_headers', 1441 'target_name': 'media_format_jni_headers',
1444 'type': 'none', 1442 'type': 'none',
1445 'variables': { 1443 'variables': {
1446 'jni_gen_package': 'media', 1444 'jni_gen_package': 'media',
1447 'input_java_class': 'android/media/MediaFormat.class', 1445 'input_java_class': 'android/media/MediaFormat.class',
1448 'input_jar_file': '<(android_sdk)/android.jar',
1449 }, 1446 },
1450 'includes': [ '../build/jar_file_jni_generator.gypi' ], 1447 'includes': [ '../build/jar_file_jni_generator.gypi' ],
1451 }, 1448 },
1452 { 1449 {
1453 'target_name': 'player_android', 1450 'target_name': 'player_android',
1454 'type': 'static_library', 1451 'type': 'static_library',
1455 'sources': [ 1452 'sources': [
1456 'base/android/media_codec_bridge.cc', 1453 'base/android/media_codec_bridge.cc',
1457 'base/android/media_codec_bridge.h', 1454 'base/android/media_codec_bridge.h',
1458 'base/android/media_jni_registrar.cc', 1455 'base/android/media_jni_registrar.cc',
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
1624 ], 1621 ],
1625 'sources': [ 1622 'sources': [
1626 'base/simd/sinc_resampler_sse.cc', 1623 'base/simd/sinc_resampler_sse.cc',
1627 'base/simd/vector_math_sse.cc', 1624 'base/simd/vector_math_sse.cc',
1628 ], 1625 ],
1629 }, # end of target media_sse 1626 }, # end of target media_sse
1630 ], 1627 ],
1631 }], 1628 }],
1632 ], 1629 ],
1633 } 1630 }
OLDNEW
« no previous file with comments | « content/content.gyp ('k') | webkit/glue/webkit_glue.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698