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

Unified Diff: media/BUILD.gn

Issue 774353003: gn format // (the rest) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase net Created 6 years 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « jingle/BUILD.gn ('k') | media/audio/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/BUILD.gn
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 518b13687f6a97851c45339e23c87f119c9f419a..363a3b41a6a215cf8fa3375053d4e6c08de62d96 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -49,16 +49,21 @@ if (use_ozone) {
script = "../ui/ozone/generate_constructor_list.py"
platform_list_txt_file = "$target_gen_dir/../ui/ozone/platform_list.txt"
- constructor_list_cc_file = "$target_gen_dir/../media/ozone/constructor_list.cc"
+ constructor_list_cc_file =
+ "$target_gen_dir/../media/ozone/constructor_list.cc"
- sources = [ platform_list_txt_file ]
- outputs = [ constructor_list_cc_file ]
+ sources = [
+ platform_list_txt_file,
+ ]
+ outputs = [
+ constructor_list_cc_file,
+ ]
args = [
"--platform_list=" + rebase_path(platform_list_txt_file, root_build_dir),
"--output_cc=" + rebase_path(constructor_list_cc_file, root_build_dir),
"--namespace=media",
"--typename=MediaOzonePlatform",
- "--include=\"media/ozone/media_ozone_platform.h\""
+ "--include=\"media/ozone/media_ozone_platform.h\"",
]
}
}
@@ -238,7 +243,7 @@ component("media") {
"formats/webm/webm_webvtt_parser.h",
]
- configs += [ ":media_config", ]
+ configs += [ ":media_config" ]
all_dependent_configs = [ ":media_dependent_config" ]
cflags = []
@@ -283,11 +288,11 @@ component("media") {
}
if (media_use_libvpx) {
- sources += [
- "filters/vpx_video_decoder.cc",
- "filters/vpx_video_decoder.h",
- ]
- deps += [ "//third_party/libvpx" ]
+ sources += [
+ "filters/vpx_video_decoder.cc",
+ "filters/vpx_video_decoder.h",
+ ]
+ deps += [ "//third_party/libvpx" ]
}
if (!is_android) {
@@ -340,9 +345,9 @@ component("media") {
include_dirs += [ target_gen_dir ]
sources += [
- "ozone/media_ozone_platform.cc",
- "ozone/media_ozone_platform.h",
- ] + get_target_outputs(":generate_ozone_constructor_list")
+ "ozone/media_ozone_platform.cc",
+ "ozone/media_ozone_platform.h",
+ ] + get_target_outputs(":generate_ozone_constructor_list")
deps += [
":generate_ozone_constructor_list",
@@ -364,9 +369,7 @@ component("media") {
}
if (is_ios) {
- deps += [
- "//media/base/mac",
- ]
+ deps += [ "//media/base/mac" ]
}
if (is_win) {
@@ -376,10 +379,8 @@ component("media") {
"mfreadwrite.lib",
"mfuuid.lib",
]
- cflags += [
- "/wd4267" # TODO(wolenetz): Fix size_t to int trunctaion in win64. See
- # http://crbug.com/171009
- ]
+ cflags += [ "/wd4267" ] # TODO(wolenetz): Fix size_t to int trunctaion in win64. See
+ # http://crbug.com/171009
}
if (proprietary_codecs) {
@@ -606,35 +607,28 @@ test("media_unittests") {
}
if (is_win && cpu_arch == "x64") {
- cflags += [
- "/wd4267" # TODO(wolenetz): Fix size_t to int trunctaion in win64. See
- # http://crbug.com/171009
- ]
+ cflags += [ "/wd4267" ] # TODO(wolenetz): Fix size_t to int trunctaion in win64. See
+ # http://crbug.com/171009
}
if (is_mac || is_ios) {
- deps += [
- "//media/base/mac",
- ]
+ deps += [ "//media/base/mac" ]
}
if (is_mac) {
- sources += [
- "video/capture/mac/video_capture_device_factory_mac_unittest.mm"
- ]
+ sources +=
+ [ "video/capture/mac/video_capture_device_factory_mac_unittest.mm" ]
}
-# include_dirs += [
-# # Needed by media_drm_bridge.cc.
-# target_gen_dir,
-# ],
+ # include_dirs += [
+ # # Needed by media_drm_bridge.cc.
+ # target_gen_dir,
+ # ],
configs += [ ":media_config" ]
if (media_use_ffmpeg) {
- deps += [
- "//third_party/ffmpeg", # Direct dependency required to inherit config.
- ]
+ deps += [ "//third_party/ffmpeg" ] # Direct dependency required to inherit config.
}
}
@@ -665,9 +659,7 @@ test("media_perftests") {
deps += [ "//ui/gl" ]
}
if (media_use_ffmpeg) {
- deps += [
- "//third_party/ffmpeg", # Direct dependency required to inherit config.
- ]
+ deps += [ "//third_party/ffmpeg" ] # Direct dependency required to inherit config.
}
}
@@ -709,22 +701,26 @@ component("shared_memory_support") {
]
configs += [ ":media_config" ]
defines = [ "MEDIA_IMPLEMENTATION" ]
- deps = [ "//base" ]
+ deps = [
+ "//base",
+ ]
}
if (media_use_ffmpeg) {
test("ffmpeg_unittests") {
- sources = [ "ffmpeg/ffmpeg_unittest.cc" ]
+ sources = [
+ "ffmpeg/ffmpeg_unittest.cc",
+ ]
deps = [
- ":media",
- ":test_support",
- "//base",
- "//base:i18n",
- "//base/test:test_support",
- "//testing/gtest",
- "//third_party/ffmpeg",
- "//ui/gfx:test_support",
+ ":media",
+ ":test_support",
+ "//base",
+ "//base:i18n",
+ "//base/test:test_support",
+ "//testing/gtest",
+ "//third_party/ffmpeg",
+ "//ui/gfx:test_support",
]
}
@@ -747,16 +743,17 @@ if (media_use_ffmpeg) {
"//ui/gfx/geometry",
"//ui/gfx:test_support",
]
- # TODO(ajwong): This was in the original gyp, but it seems silly.
- # ['os_posix==1 and OS!="mac"', {
- # 'conditions': [
- # ['use_allocator!="none"', {
- # 'dependencies': [
- # '../base/allocator/allocator.gyp:allocator',
- # ],
- # }],
- # ],
- # }],
+
+ # TODO(ajwong): This was in the original gyp, but it seems silly.
+ # ['os_posix==1 and OS!="mac"', {
+ # 'conditions': [
+ # ['use_allocator!="none"', {
+ # 'dependencies': [
+ # '../base/allocator/allocator.gyp:allocator',
+ # ],
+ # }],
+ # ],
+ # }],
}
}
@@ -775,8 +772,9 @@ if (use_x11) {
":media_config",
"//build/config/linux:x11",
"//build/config/linux:xext",
-# TODO(ajwong): Why does xext get a separate thing in //build/config/linux:BUILD.gn
- # "//build/config/linux:xrender",
+
+ # TODO(ajwong): Why does xext get a separate thing in //build/config/linux:BUILD.gn
+ # "//build/config/linux:xrender",
]
deps = [
":media",
« no previous file with comments | « jingle/BUILD.gn ('k') | media/audio/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698