| Index: content/common/BUILD.gn
|
| diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
|
| index af4c97acf3174da8e9836ccee5a3759a9084fd7d..dcf30802f0197f74cc22abf78c00ec3b8acff089 100644
|
| --- a/content/common/BUILD.gn
|
| +++ b/content/common/BUILD.gn
|
| @@ -12,8 +12,12 @@ if (is_chromeos && use_x11 && cpu_arch != "arm") {
|
| extra_header = "gpu/media/va_stub_header.fragment"
|
|
|
| script = "../../tools/generate_stubs/generate_stubs.py"
|
| - sources = [ "gpu/media/va.sigs" ]
|
| - inputs = [ extra_header ]
|
| + sources = [
|
| + "gpu/media/va.sigs",
|
| + ]
|
| + inputs = [
|
| + extra_header,
|
| + ]
|
| stubs_filename_root = "va_stubs"
|
|
|
| outputs = [
|
| @@ -21,12 +25,18 @@ if (is_chromeos && use_x11 && cpu_arch != "arm") {
|
| "$target_gen_dir/gpu/media/$stubs_filename_root.h",
|
| ]
|
| args = [
|
| - "-i", rebase_path("$target_gen_dir/gpu/media", root_build_dir),
|
| - "-o", rebase_path("$target_gen_dir/gpu/media", root_build_dir),
|
| - "-t", "posix_stubs",
|
| - "-e", rebase_path(extra_header, root_build_dir),
|
| - "-s", stubs_filename_root,
|
| - "-p", "content/common/gpu/media",
|
| + "-i",
|
| + rebase_path("$target_gen_dir/gpu/media", root_build_dir),
|
| + "-o",
|
| + rebase_path("$target_gen_dir/gpu/media", root_build_dir),
|
| + "-t",
|
| + "posix_stubs",
|
| + "-e",
|
| + rebase_path(extra_header, root_build_dir),
|
| + "-s",
|
| + stubs_filename_root,
|
| + "-p",
|
| + "content/common/gpu/media",
|
| ]
|
|
|
| args += rebase_path(sources, root_build_dir)
|
| @@ -38,8 +48,12 @@ if (is_mac) {
|
| extra_header = "gpu/media/vt_stubs_header.fragment"
|
|
|
| script = "../../tools/generate_stubs/generate_stubs.py"
|
| - sources = [ "gpu/media/vt.sig" ]
|
| - inputs = [ extra_header ]
|
| + sources = [
|
| + "gpu/media/vt.sig",
|
| + ]
|
| + inputs = [
|
| + extra_header,
|
| + ]
|
| stubs_filename_root = "vt_stubs"
|
|
|
| outputs = [
|
| @@ -47,12 +61,18 @@ if (is_mac) {
|
| "$target_gen_dir/gpu/media/$stubs_filename_root.h",
|
| ]
|
| args = [
|
| - "-i", rebase_path("$target_gen_dir/gpu/media", root_build_dir),
|
| - "-o", rebase_path("$target_gen_dir/gpu/media", root_build_dir),
|
| - "-t", "posix_stubs",
|
| - "-e", rebase_path(extra_header, root_build_dir),
|
| - "-s", stubs_filename_root,
|
| - "-p", "content/common/gpu/media",
|
| + "-i",
|
| + rebase_path("$target_gen_dir/gpu/media", root_build_dir),
|
| + "-o",
|
| + rebase_path("$target_gen_dir/gpu/media", root_build_dir),
|
| + "-t",
|
| + "posix_stubs",
|
| + "-e",
|
| + rebase_path(extra_header, root_build_dir),
|
| + "-s",
|
| + stubs_filename_root,
|
| + "-p",
|
| + "content/common/gpu/media",
|
| ]
|
|
|
| args += rebase_path(sources, root_build_dir)
|
| @@ -65,11 +85,10 @@ source_set("common") {
|
| visibility = [ "//content/public/common:common_sources" ]
|
|
|
| sources = rebase_path(content_common_gypi_values.private_common_sources,
|
| - ".", "//content")
|
| + ".",
|
| + "//content")
|
|
|
| - configs += [
|
| - "//content:content_implementation",
|
| - ]
|
| + configs += [ "//content:content_implementation" ]
|
|
|
| public_deps = [
|
| "//gpu/command_buffer/common",
|
| @@ -100,6 +119,7 @@ source_set("common") {
|
| "//cc",
|
| "//ipc",
|
| "//ipc/mojo",
|
| +
|
| # TODO: the dependency on gl_in_process_context should be decoupled from
|
| # content and moved to android_webview. See crbug.com/365797.
|
| "//gpu/command_buffer/client:gl_in_process_context",
|
| @@ -139,13 +159,11 @@ source_set("common") {
|
|
|
| if (is_mac) {
|
| sources += [
|
| - "gpu/client/gpu_memory_buffer_impl_io_surface.cc",
|
| - "gpu/client/gpu_memory_buffer_impl_io_surface.h",
|
| - ] + get_target_outputs(":libvt_generate_stubs")
|
| + "gpu/client/gpu_memory_buffer_impl_io_surface.cc",
|
| + "gpu/client/gpu_memory_buffer_impl_io_surface.h",
|
| + ] + get_target_outputs(":libvt_generate_stubs")
|
|
|
| - sources -= [
|
| - "plugin_list_posix.cc",
|
| - ]
|
| + sources -= [ "plugin_list_posix.cc" ]
|
|
|
| deps += [
|
| ":libvt_generate_stubs",
|
| @@ -210,9 +228,7 @@ source_set("common") {
|
| sources -= [ "font_list_ozone.cc" ]
|
| }
|
| } else {
|
| - sources -= [
|
| - "font_list_pango.cc",
|
| - ]
|
| + sources -= [ "font_list_pango.cc" ]
|
| }
|
|
|
| if (use_x11) {
|
| @@ -220,7 +236,7 @@ source_set("common") {
|
| configs += [ "//build/config/linux:xcomposite" ]
|
|
|
| if (cpu_arch != "arm" || !is_chromeos) {
|
| - sources +=[
|
| + sources += [
|
| "gpu/x_util.cc",
|
| "gpu/x_util.h",
|
| ]
|
| @@ -228,9 +244,7 @@ source_set("common") {
|
| }
|
|
|
| if (enable_plugins) {
|
| - deps += [
|
| - "//ppapi:ppapi_shared",
|
| - ]
|
| + deps += [ "//ppapi:ppapi_shared" ]
|
| } else {
|
| sources -= [
|
| "pepper_file_util.cc",
|
| @@ -274,21 +288,24 @@ source_set("common") {
|
| "gpu/media/v4l2_video_encode_accelerator.cc",
|
| "gpu/media/v4l2_video_encode_accelerator.h",
|
| ]
|
| - libs = [ "EGL", "GLESv2" ]
|
| + libs = [
|
| + "EGL",
|
| + "GLESv2",
|
| + ]
|
| } else { # !arm
|
| sources += [
|
| - "gpu/media/h264_dpb.cc",
|
| - "gpu/media/h264_dpb.h",
|
| - "gpu/media/va_surface.h",
|
| - "gpu/media/vaapi_h264_decoder.cc",
|
| - "gpu/media/vaapi_h264_decoder.h",
|
| - "gpu/media/vaapi_video_decode_accelerator.cc",
|
| - "gpu/media/vaapi_video_decode_accelerator.h",
|
| - "gpu/media/vaapi_video_encode_accelerator.cc",
|
| - "gpu/media/vaapi_video_encode_accelerator.h",
|
| - "gpu/media/vaapi_wrapper.cc",
|
| - "gpu/media/vaapi_wrapper.h",
|
| - ] + get_target_outputs(":libva_generate_stubs")
|
| + "gpu/media/h264_dpb.cc",
|
| + "gpu/media/h264_dpb.h",
|
| + "gpu/media/va_surface.h",
|
| + "gpu/media/vaapi_h264_decoder.cc",
|
| + "gpu/media/vaapi_h264_decoder.h",
|
| + "gpu/media/vaapi_video_decode_accelerator.cc",
|
| + "gpu/media/vaapi_video_decode_accelerator.h",
|
| + "gpu/media/vaapi_video_encode_accelerator.cc",
|
| + "gpu/media/vaapi_video_encode_accelerator.h",
|
| + "gpu/media/vaapi_wrapper.cc",
|
| + "gpu/media/vaapi_wrapper.h",
|
| + ] + get_target_outputs(":libva_generate_stubs")
|
| configs += [
|
| "//third_party/libva:libva_config",
|
| "//third_party/libyuv:libyuv_config",
|
| @@ -307,9 +324,7 @@ source_set("common") {
|
| "gpu/media/dxva_video_decode_accelerator.h",
|
| ]
|
| include_dirs += [ "//third_party/khronos" ]
|
| - deps += [
|
| - "//ui/gl",
|
| - ]
|
| + deps += [ "//ui/gl" ]
|
|
|
| # TODO(GYP): extract_xinput action.
|
| }
|
|
|