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

Side by Side Diff: media/media.gyp

Issue 962793005: Adds MediaClientAndroid to support embedder/MediaDrmBridge interaction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rename createSession to createSessionFromNative to avoid bug in FindBugs Created 5 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
« no previous file with comments | « media/base/android/media_drm_bridge_delegate.cc ('k') | no next file » | 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 1721 matching lines...) Expand 10 before | Expand all | Expand 10 after
1732 'target_name': 'player_android', 1732 'target_name': 'player_android',
1733 'type': 'static_library', 1733 'type': 'static_library',
1734 'sources': [ 1734 'sources': [
1735 'base/android/audio_decoder_job.cc', 1735 'base/android/audio_decoder_job.cc',
1736 'base/android/audio_decoder_job.h', 1736 'base/android/audio_decoder_job.h',
1737 'base/android/browser_cdm_factory_android.cc', 1737 'base/android/browser_cdm_factory_android.cc',
1738 'base/android/browser_cdm_factory_android.h', 1738 'base/android/browser_cdm_factory_android.h',
1739 'base/android/demuxer_android.h', 1739 'base/android/demuxer_android.h',
1740 'base/android/demuxer_stream_player_params.cc', 1740 'base/android/demuxer_stream_player_params.cc',
1741 'base/android/demuxer_stream_player_params.h', 1741 'base/android/demuxer_stream_player_params.h',
1742 'base/android/media_client_android.cc',
1743 'base/android/media_client_android.h',
1742 'base/android/media_codec_bridge.cc', 1744 'base/android/media_codec_bridge.cc',
1743 'base/android/media_codec_bridge.h', 1745 'base/android/media_codec_bridge.h',
1744 'base/android/media_common_android.h', 1746 'base/android/media_common_android.h',
1745 'base/android/media_decoder_job.cc', 1747 'base/android/media_decoder_job.cc',
1746 'base/android/media_decoder_job.h', 1748 'base/android/media_decoder_job.h',
1747 'base/android/media_drm_bridge.cc', 1749 'base/android/media_drm_bridge.cc',
1748 'base/android/media_drm_bridge.h', 1750 'base/android/media_drm_bridge.h',
1751 'base/android/media_drm_bridge_delegate.cc',
1752 'base/android/media_drm_bridge_delegate.h',
1749 'base/android/media_jni_registrar.cc', 1753 'base/android/media_jni_registrar.cc',
1750 'base/android/media_jni_registrar.h', 1754 'base/android/media_jni_registrar.h',
1751 'base/android/media_player_android.cc', 1755 'base/android/media_player_android.cc',
1752 'base/android/media_player_android.h', 1756 'base/android/media_player_android.h',
1753 'base/android/media_player_bridge.cc', 1757 'base/android/media_player_bridge.cc',
1754 'base/android/media_player_bridge.h', 1758 'base/android/media_player_bridge.h',
1755 'base/android/media_player_listener.cc', 1759 'base/android/media_player_listener.cc',
1756 'base/android/media_player_listener.h', 1760 'base/android/media_player_listener.h',
1757 'base/android/media_player_manager.h', 1761 'base/android/media_player_manager.h',
1758 'base/android/media_resource_getter.cc', 1762 'base/android/media_resource_getter.cc',
(...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after
1947 '../build/isolate.gypi', 1951 '../build/isolate.gypi',
1948 ], 1952 ],
1949 'sources': [ 1953 'sources': [
1950 'media_unittests.isolate', 1954 'media_unittests.isolate',
1951 ], 1955 ],
1952 }, 1956 },
1953 ], 1957 ],
1954 }], 1958 }],
1955 ], 1959 ],
1956 } 1960 }
OLDNEW
« no previous file with comments | « media/base/android/media_drm_bridge_delegate.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698