Commit 5ffe4388 authored by Oscar Johansson's avatar Oscar Johansson Committed by Commit Bot

Enable jumbo support in media/base

Building //media takes around 23 CPU minutes. A experimental
branch showed that this could be reduced, by using jumbo,
to around 9 CPU minutes. media/base is the second largest part
of media and takes around 3.1 CPU minutes to compile without
jumbo.

This commit enables jumbo for media/base.

Bug: 867350
Change-Id: Ie2dae0a65bfc596b30339712a39cab321e293f48
Reviewed-on: https://chromium-review.googlesource.com/1150037Reviewed-by: default avatarChrome Cunningham (In Paris) <chcunningham@chromium.org>
Commit-Queue: Oscar Johansson <oscarj@opera.com>
Cr-Commit-Position: refs/heads/master@{#578305}
parent ead0c010
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
import("//build/config/android/config.gni") import("//build/config/android/config.gni")
import("//build/config/arm.gni") import("//build/config/arm.gni")
import("//build/config/features.gni") import("//build/config/features.gni")
import("//build/config/jumbo.gni")
import("//build/config/ui.gni") import("//build/config/ui.gni")
import("//build/config/linux/pkg_config.gni") import("//build/config/linux/pkg_config.gni")
import("//media/media_options.gni") import("//media/media_options.gni")
...@@ -14,7 +15,7 @@ if (is_android) { ...@@ -14,7 +15,7 @@ if (is_android) {
import("//build/config/android/rules.gni") import("//build/config/android/rules.gni")
} }
source_set("base") { jumbo_source_set("base") {
# Do not expand the visibility here without double-checking with OWNERS, this # Do not expand the visibility here without double-checking with OWNERS, this
# is a roll-up target which is part of the //media component. Most other DEPs # is a roll-up target which is part of the //media component. Most other DEPs
# should be using //media and not directly DEP this roll-up target. # should be using //media and not directly DEP this roll-up target.
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
import("//build/config/android/config.gni") import("//build/config/android/config.gni")
import("//build/config/arm.gni") import("//build/config/arm.gni")
import("//build/config/jumbo.gni")
import("//build/config/ui.gni") import("//build/config/ui.gni")
import("//media/media_options.gni") import("//media/media_options.gni")
...@@ -13,7 +14,7 @@ if (is_android) { ...@@ -13,7 +14,7 @@ if (is_android) {
# This is bundled into //media, so all dependencies should be on //media. # This is bundled into //media, so all dependencies should be on //media.
# APK targets that depend on this indirectly, should also # APK targets that depend on this indirectly, should also
# depend on :media_java to get the corresponding Java classes. # depend on :media_java to get the corresponding Java classes.
source_set("android") { jumbo_source_set("android") {
visibility = [ visibility = [
"//media", "//media",
"//media/filters", "//media/filters",
......
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
source_set("ipc") { import("//build/config/jumbo.gni")
jumbo_source_set("ipc") {
sources = [ sources = [
"media_param_traits.cc", "media_param_traits.cc",
"media_param_traits.h", "media_param_traits.h",
......
...@@ -2,9 +2,11 @@ ...@@ -2,9 +2,11 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
import("//build/config/jumbo.gni")
assert(is_mac || is_ios) assert(is_mac || is_ios)
source_set("mac") { jumbo_source_set("mac") {
# Note: This source_set is depended on only by //media. In the component # Note: This source_set is depended on only by //media. In the component
# build, if other component targets also depend on it, multiple copies of # build, if other component targets also depend on it, multiple copies of
# the ObjC classes declared in the files below will cause warnings at # the ObjC classes declared in the files below will cause warnings at
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
import("//build/config/jumbo.gni")
assert(is_win) assert(is_win)
config("delay_load_mf") { config("delay_load_mf") {
...@@ -12,7 +14,7 @@ config("delay_load_mf") { ...@@ -12,7 +14,7 @@ config("delay_load_mf") {
] ]
} }
component("win") { jumbo_component("win") {
output_name = "media_win_util" output_name = "media_win_util"
defines = [ "MF_INITIALIZER_IMPLEMENTATION" ] defines = [ "MF_INITIALIZER_IMPLEMENTATION" ]
set_sources_assignment_filter([]) set_sources_assignment_filter([])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment