Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 535 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 546 ], | 546 ], |
| 547 'link_settings': { | 547 'link_settings': { |
| 548 'libraries': [ | 548 'libraries': [ |
| 549 '-lOpenSLES', | 549 '-lOpenSLES', |
| 550 ], | 550 ], |
| 551 }, | 551 }, |
| 552 'include_dirs': [ | 552 'include_dirs': [ |
| 553 '<(SHARED_INTERMEDIATE_DIR)/media', | 553 '<(SHARED_INTERMEDIATE_DIR)/media', |
| 554 ], | 554 ], |
| 555 'dependencies': [ | 555 'dependencies': [ |
| 556 'audio_manager_android_jni_headers', | |
| 556 'video_capture_android_jni_headers', | 557 'video_capture_android_jni_headers', |
| 557 ], | 558 ], |
| 558 }], | 559 }], |
| 559 # A simple WebM encoder for animated avatars on ChromeOS. | 560 # A simple WebM encoder for animated avatars on ChromeOS. |
| 560 ['chromeos==1', { | 561 ['chromeos==1', { |
| 561 'dependencies': [ | 562 'dependencies': [ |
| 562 '../third_party/libvpx/libvpx.gyp:libvpx', | 563 '../third_party/libvpx/libvpx.gyp:libvpx', |
| 563 '../third_party/libyuv/libyuv.gyp:libyuv', | 564 '../third_party/libyuv/libyuv.gyp:libyuv', |
| 564 ], | 565 ], |
| 565 'sources': [ | 566 'sources': [ |
| (...skipping 853 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1419 'sources': [ | 1420 'sources': [ |
| 1420 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java', | 1421 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java', |
| 1421 'base/android/java/src/org/chromium/media/MediaPlayerListener.java', | 1422 'base/android/java/src/org/chromium/media/MediaPlayerListener.java', |
| 1422 ], | 1423 ], |
| 1423 'variables': { | 1424 'variables': { |
| 1424 'jni_gen_package': 'media', | 1425 'jni_gen_package': 'media', |
| 1425 }, | 1426 }, |
| 1426 'includes': [ '../build/jni_generator.gypi' ], | 1427 'includes': [ '../build/jni_generator.gypi' ], |
| 1427 }, | 1428 }, |
| 1428 { | 1429 { |
| 1430 'target_name': 'audio_manager_android_jni_headers', | |
|
Yaron
2013/03/11 21:56:50
There's no need to split this into two targets. I
leozwang1
2013/03/12 22:23:00
Done.
| |
| 1431 'type': 'none', | |
| 1432 'sources': [ | |
| 1433 'base/android/java/src/org/chromium/media/AudioManagerAndroid.java', | |
| 1434 ], | |
| 1435 'variables': { | |
| 1436 'jni_gen_package': 'media', | |
| 1437 }, | |
| 1438 'includes': [ '../build/jni_generator.gypi' ], | |
| 1439 }, | |
| 1440 { | |
| 1429 'target_name': 'video_capture_android_jni_headers', | 1441 'target_name': 'video_capture_android_jni_headers', |
| 1430 'type': 'none', | 1442 'type': 'none', |
| 1431 'sources': [ | 1443 'sources': [ |
| 1432 'base/android/java/src/org/chromium/media/VideoCapture.java', | 1444 'base/android/java/src/org/chromium/media/VideoCapture.java', |
| 1433 ], | 1445 ], |
| 1434 'variables': { | 1446 'variables': { |
| 1435 'jni_gen_package': 'media', | 1447 'jni_gen_package': 'media', |
| 1436 }, | 1448 }, |
| 1437 'includes': [ '../build/jni_generator.gypi' ], | 1449 'includes': [ '../build/jni_generator.gypi' ], |
| 1438 }, | 1450 }, |
| (...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1631 ], | 1643 ], |
| 1632 'sources': [ | 1644 'sources': [ |
| 1633 'base/simd/sinc_resampler_sse.cc', | 1645 'base/simd/sinc_resampler_sse.cc', |
| 1634 'base/simd/vector_math_sse.cc', | 1646 'base/simd/vector_math_sse.cc', |
| 1635 ], | 1647 ], |
| 1636 }, # end of target media_sse | 1648 }, # end of target media_sse |
| 1637 ], | 1649 ], |
| 1638 }], | 1650 }], |
| 1639 ], | 1651 ], |
| 1640 } | 1652 } |
| OLD | NEW |