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

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: Created 4 years, 11 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
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/test.gni") 12 import("//testing/test.gni")
13 13
14 buildflag_header("media_features") { 14 buildflag_header("media_features") {
15 header = "media_features.h" 15 header = "media_features.h"
16 16
17 flags = 17 flags =
18 [ "ENABLE_MSE_MPEG2TS_STREAM_PARSER=$enable_mse_mpeg2ts_stream_parser" ] 18 [ "ENABLE_MSE_MPEG2TS_STREAM_PARSER=$enable_mse_mpeg2ts_stream_parser" ]
19 } 19 }
20 20
21 # XXX how to get same behaviour as 'ffmpeg_branding%': "Chromium",
22 if (proprietary_codecs && media_use_ffmpeg && ffmpeg_branding == "Chromium") {
23 #XXX how to fail ?
24 #proprietary codecs and ffmpeg_branding set to Chromium are incompatible
25 }
jrummell 2016/01/11 22:05:47 Looks like assert() is the way to fail. Maybe remo
Julien Isorce Samsung 2016/08/17 23:54:58 Done, thx.
26
21 # Common configuration for targets in the media directory. 27 # Common configuration for targets in the media directory.
22 # NOT for exporting. 28 # NOT for exporting.
23 config("media_config") { 29 config("media_config") {
24 defines = [] 30 defines = []
25 if (!media_use_libvpx) { 31 if (!media_use_libvpx) {
26 defines += [ "MEDIA_DISABLE_LIBVPX" ] 32 defines += [ "MEDIA_DISABLE_LIBVPX" ]
27 } 33 }
28 if (!media_use_ffmpeg) { 34 if (!media_use_ffmpeg) {
29 defines += [ "MEDIA_DISABLE_FFMPEG" ] 35 defines += [ "MEDIA_DISABLE_FFMPEG" ]
30 } 36 }
(...skipping 895 matching lines...) Expand 10 before | Expand all | Expand 10 after
926 "//media/base:test_support", 932 "//media/base:test_support",
927 "//media/test:pipeline_integration_tests", 933 "//media/test:pipeline_integration_tests",
928 "//testing/gmock", 934 "//testing/gmock",
929 "//testing/gtest", 935 "//testing/gtest",
930 "//third_party/ffmpeg", 936 "//third_party/ffmpeg",
931 "//ui/gfx:test_support", 937 "//ui/gfx:test_support",
932 "//ui/gfx/geometry", 938 "//ui/gfx/geometry",
933 ] 939 ]
934 } 940 }
935 } 941 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698