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

Side by Side Diff: media/media.gyp

Issue 288963002: Android: cleans up jni_generator_ptr_type. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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_tests.gypi ('k') | mojo/mojo.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 cras (ChromeOS audio) library. 8 # Override to dynamically link the cras (ChromeOS audio) library.
9 'use_cras%': 0, 9 'use_cras%': 0,
10 # Option e.g. for Linux distributions to link pulseaudio directly 10 # Option e.g. for Linux distributions to link pulseaudio directly
(...skipping 1572 matching lines...) Expand 10 before | Expand all | Expand 10 after
1583 'base/android/java/src/org/chromium/media/MediaCodecBridge.java', 1583 'base/android/java/src/org/chromium/media/MediaCodecBridge.java',
1584 'base/android/java/src/org/chromium/media/MediaDrmBridge.java', 1584 'base/android/java/src/org/chromium/media/MediaDrmBridge.java',
1585 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java', 1585 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java',
1586 'base/android/java/src/org/chromium/media/MediaPlayerListener.java', 1586 'base/android/java/src/org/chromium/media/MediaPlayerListener.java',
1587 'base/android/java/src/org/chromium/media/UsbMidiDeviceAndroid.java' , 1587 'base/android/java/src/org/chromium/media/UsbMidiDeviceAndroid.java' ,
1588 'base/android/java/src/org/chromium/media/UsbMidiDeviceFactoryAndroi d.java', 1588 'base/android/java/src/org/chromium/media/UsbMidiDeviceFactoryAndroi d.java',
1589 'base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.j ava', 1589 'base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.j ava',
1590 ], 1590 ],
1591 'variables': { 1591 'variables': {
1592 'jni_gen_package': 'media', 1592 'jni_gen_package': 'media',
1593 'jni_generator_ptr_type': 'long',
1594 }, 1593 },
1595 'includes': ['../build/jni_generator.gypi'], 1594 'includes': ['../build/jni_generator.gypi'],
1596 }, 1595 },
1597 { 1596 {
1598 'target_name': 'video_capture_android_jni_headers', 1597 'target_name': 'video_capture_android_jni_headers',
1599 'type': 'none', 1598 'type': 'none',
1600 'sources': [ 1599 'sources': [
1601 'base/android/java/src/org/chromium/media/VideoCapture.java', 1600 'base/android/java/src/org/chromium/media/VideoCapture.java',
1602 'base/android/java/src/org/chromium/media/VideoCaptureFactory.java', 1601 'base/android/java/src/org/chromium/media/VideoCaptureFactory.java',
1603 ], 1602 ],
1604 'variables': { 1603 'variables': {
1605 'jni_gen_package': 'media', 1604 'jni_gen_package': 'media',
1606 'jni_generator_ptr_type': 'long',
1607 }, 1605 },
1608 'includes': ['../build/jni_generator.gypi'], 1606 'includes': ['../build/jni_generator.gypi'],
1609 }, 1607 },
1610 { 1608 {
1611 'target_name': 'player_android', 1609 'target_name': 'player_android',
1612 'type': 'static_library', 1610 'type': 'static_library',
1613 'sources': [ 1611 'sources': [
1614 'base/android/audio_decoder_job.cc', 1612 'base/android/audio_decoder_job.cc',
1615 'base/android/audio_decoder_job.h', 1613 'base/android/audio_decoder_job.h',
1616 'base/android/media_codec_bridge.cc', 1614 'base/android/media_codec_bridge.cc',
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
1724 ], 1722 ],
1725 }], 1723 }],
1726 ], 1724 ],
1727 }], 1725 }],
1728 ], 1726 ],
1729 }, 1727 },
1730 ], 1728 ],
1731 }], 1729 }],
1732 ], 1730 ],
1733 } 1731 }
OLDNEW
« no previous file with comments | « content/content_tests.gypi ('k') | mojo/mojo.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698