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

Side by Side Diff: media/media.gyp

Issue 1048863002: Remove android_webview_build conditions from various places. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 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/BUILD.gn ('k') | net/BUILD.gn » ('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 693 matching lines...) Expand 10 before | Expand all | Expand 10 after
704 'sources': [ 704 'sources': [
705 'base/browser_cdm.cc', 705 'base/browser_cdm.cc',
706 'base/browser_cdm.h', 706 'base/browser_cdm.h',
707 'base/browser_cdm_factory.cc', 707 'base/browser_cdm_factory.cc',
708 'base/browser_cdm_factory.h', 708 'base/browser_cdm_factory.h',
709 ], 709 ],
710 }], 710 }],
711 ['OS=="android"', { 711 ['OS=="android"', {
712 'dependencies': [ 712 'dependencies': [
713 'media_android_jni_headers', 713 'media_android_jni_headers',
714 'media_java',
714 'player_android', 715 'player_android',
715 'video_capture_android_jni_headers', 716 'video_capture_android_jni_headers',
716 ], 717 ],
717 'sources': [ 718 'sources': [
718 'base/media.cc', 719 'base/media.cc',
719 'base/media.h', 720 'base/media.h',
720 'base/media_stub.cc', 721 'base/media_stub.cc',
721 ], 722 ],
722 'sources!': [ 723 'sources!': [
723 'filters/opus_audio_decoder.cc', 724 'filters/opus_audio_decoder.cc',
724 'filters/opus_audio_decoder.h', 725 'filters/opus_audio_decoder.h',
725 'renderers/default_renderer_factory.cc', 726 'renderers/default_renderer_factory.cc',
726 'renderers/default_renderer_factory.h', 727 'renderers/default_renderer_factory.h',
727 ], 728 ],
728 'conditions': [
729 ['android_webview_build==0', {
730 'dependencies': [
731 'media_java',
732 ],
733 }],
734 ],
735 'defines': [ 729 'defines': [
736 'DISABLE_USER_INPUT_MONITOR', 730 'DISABLE_USER_INPUT_MONITOR',
737 ], 731 ],
738 }], 732 }],
739 # For VaapiVideoEncodeAccelerator. 733 # For VaapiVideoEncodeAccelerator.
740 ['target_arch != "arm" and chromeos == 1', { 734 ['target_arch != "arm" and chromeos == 1', {
741 'sources': [ 735 'sources': [
742 'filters/h264_bitstream_buffer.cc', 736 'filters/h264_bitstream_buffer.cc',
743 'filters/h264_bitstream_buffer.h', 737 'filters/h264_bitstream_buffer.h',
744 ], 738 ],
(...skipping 1226 matching lines...) Expand 10 before | Expand all | Expand 10 after
1971 '../build/isolate.gypi', 1965 '../build/isolate.gypi',
1972 ], 1966 ],
1973 'sources': [ 1967 'sources': [
1974 'media_unittests.isolate', 1968 'media_unittests.isolate',
1975 ], 1969 ],
1976 }, 1970 },
1977 ], 1971 ],
1978 }], 1972 }],
1979 ], 1973 ],
1980 } 1974 }
OLDNEW
« no previous file with comments | « media/BUILD.gn ('k') | net/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698