diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/build_overrides | |
parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/build_overrides')
-rw-r--r-- | chromium/build_overrides/OWNERS | 5 | ||||
-rw-r--r-- | chromium/build_overrides/README.md | 20 | ||||
-rw-r--r-- | chromium/build_overrides/v8.gni | 45 | ||||
-rw-r--r-- | chromium/build_overrides/webrtc.gni | 20 |
4 files changed, 90 insertions, 0 deletions
diff --git a/chromium/build_overrides/OWNERS b/chromium/build_overrides/OWNERS new file mode 100644 index 00000000000..7bbf005ad7f --- /dev/null +++ b/chromium/build_overrides/OWNERS @@ -0,0 +1,5 @@ +brettw@chromium.org +dpranke@chromium.org +jochen@chromium.org +machenbach@chromium.org +kjellander@chromium.org diff --git a/chromium/build_overrides/README.md b/chromium/build_overrides/README.md new file mode 100644 index 00000000000..d26312c9325 --- /dev/null +++ b/chromium/build_overrides/README.md @@ -0,0 +1,20 @@ +# Build overrides in GN + +This directory is used to allow different products to customize settings +for repos that are DEPS'ed in or shared. + +For example: V8 could be built on its own (in a "standalone" configuration), +and it could be built as part of Chromium. V8 might define a top-level +target, //v8:d8 (a simple executable), that should only be built in the +standalone configuration. To figure out whether or not it should be +in a standalone configuration, v8 can create a file, build_overrides/v8.gni, +that contains a variable, `build_standalone_d8 = true`. +and import it (as import("//build_overrides/v8.gni") from its top-level +BUILD.gn file. + +Chromium, on the other hand, might not need to build d8, and so it would +create its own build_overrides/v8.gni file, and in it set +`build_standalone_d8 = false`. + +The two files should define the same set of variables, but the values can +vary as appropriate to the needs of the two different builds. diff --git a/chromium/build_overrides/v8.gni b/chromium/build_overrides/v8.gni new file mode 100644 index 00000000000..e50a6a2d894 --- /dev/null +++ b/chromium/build_overrides/v8.gni @@ -0,0 +1,45 @@ +# Copyright 2015 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +if (is_android) { + import("//build/config/android/config.gni") +} + +# TODO(sky): nuke this. Temporary while sorting out http://crbug.com/465456. +enable_correct_v8_arch = false + +# TODO: Set v8_use_external_startup_data to true on Windows and iOS to match +# GYP. +# iOS - http://crbug.com/545676 +v8_use_external_startup_data = !is_ios + +# V8 extras +# Adding V8 extras files requires API owners review +# Be sure to synchronize with build/common.gypi + +v8_extra_library_files = + [ "../third_party/WebKit/Source/core/streams/ReadableStreamTempStub.js" ] +v8_experimental_extra_library_files = [ + "../third_party/WebKit/Source/core/streams/ByteLengthQueuingStrategy.js", + "../third_party/WebKit/Source/core/streams/CountQueuingStrategy.js", + "../third_party/WebKit/Source/core/streams/ReadableStream.js", +] + +if (is_android) { + v8_external_startup_data_renaming_sources = [ + "$root_out_dir/natives_blob.bin", + "$root_out_dir/snapshot_blob.bin", + ] + if (current_cpu == "arm" || current_cpu == "x86" || current_cpu == "mipsel") { + v8_external_startup_data_renaming_destinations = [ + "natives_blob_32.bin", + "snapshot_blob_32.bin", + ] + } else { + v8_external_startup_data_renaming_destinations = [ + "natives_blob_64.bin", + "snapshot_blob_64.bin", + ] + } +} diff --git a/chromium/build_overrides/webrtc.gni b/chromium/build_overrides/webrtc.gni new file mode 100644 index 00000000000..9b6b1608ca8 --- /dev/null +++ b/chromium/build_overrides/webrtc.gni @@ -0,0 +1,20 @@ +# Copyright 2015 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +build_with_chromium = true + +# Exclude pulse audio on Chromium since its prerequisites don't require +# pulse audio. +rtc_include_pulse_audio = false + +# Exclude internal ADM since Chromium uses its own IO handling. +rtc_include_internal_audio_device = false + +declare_args() { + # TODO(dpranke): This is a hack needed to get iOS to build w/ a + # patched version of WebRTC so that we can access the xmllite + # library. Remove this once we've figured out how to get WebRTC building + # properly. + ios_use_webrtc = false +} |