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

Side by Side Diff: trunk/src/media/media.gyp

Issue 292433004: Revert 270750 "Android: cleans up jni_generator_ptr_type." (Closed) Base URL: svn://svn.chromium.org/chrome/
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 | « trunk/src/content/content_tests.gypi ('k') | trunk/src/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 1574 matching lines...) Expand 10 before | Expand all | Expand 10 after
1585 'base/android/java/src/org/chromium/media/MediaCodecBridge.java', 1585 'base/android/java/src/org/chromium/media/MediaCodecBridge.java',
1586 'base/android/java/src/org/chromium/media/MediaDrmBridge.java', 1586 'base/android/java/src/org/chromium/media/MediaDrmBridge.java',
1587 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java', 1587 'base/android/java/src/org/chromium/media/MediaPlayerBridge.java',
1588 'base/android/java/src/org/chromium/media/MediaPlayerListener.java', 1588 'base/android/java/src/org/chromium/media/MediaPlayerListener.java',
1589 'base/android/java/src/org/chromium/media/UsbMidiDeviceAndroid.java' , 1589 'base/android/java/src/org/chromium/media/UsbMidiDeviceAndroid.java' ,
1590 'base/android/java/src/org/chromium/media/UsbMidiDeviceFactoryAndroi d.java', 1590 'base/android/java/src/org/chromium/media/UsbMidiDeviceFactoryAndroi d.java',
1591 'base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.j ava', 1591 'base/android/java/src/org/chromium/media/WebAudioMediaCodecBridge.j ava',
1592 ], 1592 ],
1593 'variables': { 1593 'variables': {
1594 'jni_gen_package': 'media', 1594 'jni_gen_package': 'media',
1595 'jni_generator_ptr_type': 'long',
1595 }, 1596 },
1596 'includes': ['../build/jni_generator.gypi'], 1597 'includes': ['../build/jni_generator.gypi'],
1597 }, 1598 },
1598 { 1599 {
1599 'target_name': 'video_capture_android_jni_headers', 1600 'target_name': 'video_capture_android_jni_headers',
1600 'type': 'none', 1601 'type': 'none',
1601 'sources': [ 1602 'sources': [
1602 'base/android/java/src/org/chromium/media/VideoCapture.java', 1603 'base/android/java/src/org/chromium/media/VideoCapture.java',
1603 'base/android/java/src/org/chromium/media/VideoCaptureFactory.java', 1604 'base/android/java/src/org/chromium/media/VideoCaptureFactory.java',
1604 ], 1605 ],
1605 'variables': { 1606 'variables': {
1606 'jni_gen_package': 'media', 1607 'jni_gen_package': 'media',
1608 'jni_generator_ptr_type': 'long',
1607 }, 1609 },
1608 'includes': ['../build/jni_generator.gypi'], 1610 'includes': ['../build/jni_generator.gypi'],
1609 }, 1611 },
1610 { 1612 {
1611 'target_name': 'player_android', 1613 'target_name': 'player_android',
1612 'type': 'static_library', 1614 'type': 'static_library',
1613 'sources': [ 1615 'sources': [
1614 'base/android/audio_decoder_job.cc', 1616 'base/android/audio_decoder_job.cc',
1615 'base/android/audio_decoder_job.h', 1617 'base/android/audio_decoder_job.h',
1616 'base/android/media_codec_bridge.cc', 1618 'base/android/media_codec_bridge.cc',
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
1724 ], 1726 ],
1725 }], 1727 }],
1726 ], 1728 ],
1727 }], 1729 }],
1728 ], 1730 ],
1729 }, 1731 },
1730 ], 1732 ],
1731 }], 1733 }],
1732 ], 1734 ],
1733 } 1735 }
OLDNEW
« no previous file with comments | « trunk/src/content/content_tests.gypi ('k') | trunk/src/mojo/mojo.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698