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

Side by Side Diff: media/BUILD.gn

Issue 1569053002: Raise gyp/GN failure if proprietary_codecs=1 and ffmpeg_branding=Chromium (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address remarks Created 4 years, 4 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 | « no previous file | 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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 import("//build/buildflag_header.gni") 5 import("//build/buildflag_header.gni")
6 import("//build/config/android/config.gni") 6 import("//build/config/android/config.gni")
7 import("//build/config/arm.gni") 7 import("//build/config/arm.gni")
8 import("//build/config/features.gni") 8 import("//build/config/features.gni")
9 import("//build/config/linux/pkg_config.gni") 9 import("//build/config/linux/pkg_config.gni")
10 import("//build/config/ui.gni") 10 import("//build/config/ui.gni")
11 import("//media/media_options.gni") 11 import("//media/media_options.gni")
12 import("//testing/libfuzzer/fuzzer_test.gni") 12 import("//testing/libfuzzer/fuzzer_test.gni")
13 import("//testing/test.gni") 13 import("//testing/test.gni")
14 import("//third_party/ffmpeg/ffmpeg_options.gni")
14 15
15 buildflag_header("media_features") { 16 buildflag_header("media_features") {
16 header = "media_features.h" 17 header = "media_features.h"
17 18
18 flags = [ 19 flags = [
19 "ENABLE_AC3_EAC3_AUDIO_DEMUXING=$enable_ac3_eac3_audio_demuxing", 20 "ENABLE_AC3_EAC3_AUDIO_DEMUXING=$enable_ac3_eac3_audio_demuxing",
20 "ENABLE_HEVC_DEMUXING=$enable_hevc_demuxing", 21 "ENABLE_HEVC_DEMUXING=$enable_hevc_demuxing",
21 "ENABLE_MSE_MPEG2TS_STREAM_PARSER=$enable_mse_mpeg2ts_stream_parser", 22 "ENABLE_MSE_MPEG2TS_STREAM_PARSER=$enable_mse_mpeg2ts_stream_parser",
22 ] 23 ]
23 } 24 }
24 25
26 if (proprietary_codecs && media_use_ffmpeg) {
27 assert(
28 ffmpeg_branding != "Chromium",
29 "proprietary codecs and ffmpeg_branding set to Chromium are incompatible")
30 }
31
25 # Common configuration for targets in the media directory. 32 # Common configuration for targets in the media directory.
26 # NOT for exporting. 33 # NOT for exporting.
27 config("media_config") { 34 config("media_config") {
28 defines = [] 35 defines = []
29 if (!media_use_libvpx) { 36 if (!media_use_libvpx) {
30 defines += [ "MEDIA_DISABLE_LIBVPX" ] 37 defines += [ "MEDIA_DISABLE_LIBVPX" ]
31 } 38 }
32 if (!media_use_ffmpeg) { 39 if (!media_use_ffmpeg) {
33 defines += [ "MEDIA_DISABLE_FFMPEG" ] 40 defines += [ "MEDIA_DISABLE_FFMPEG" ]
34 } 41 }
(...skipping 842 matching lines...) Expand 10 before | Expand all | Expand 10 after
877 sources = [ 884 sources = [
878 "filters/vpx_video_decoder_fuzzertest.cc", 885 "filters/vpx_video_decoder_fuzzertest.cc",
879 ] 886 ]
880 deps = [ 887 deps = [
881 ":media", 888 ":media",
882 "//base", 889 "//base",
883 ] 890 ]
884 libfuzzer_options = [ "max_len = 400000" ] 891 libfuzzer_options = [ "max_len = 400000" ]
885 seed_corpus = "//media/test/data" 892 seed_corpus = "//media/test/data"
886 } 893 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698