diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-08-01 12:59:39 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:40:43 +0000 |
| commit | 28b1110370900897ab652cb420c371fab8857ad4 (patch) | |
| tree | 41b32127d23b0df4f2add2a27e12dc87bddb260e /chromium/build_overrides | |
| parent | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (diff) | |
| download | qtwebengine-chromium-28b1110370900897ab652cb420c371fab8857ad4.tar.gz | |
BASELINE: Update Chromium to 53.0.2785.41
Also adds a few extra files for extensions.
Change-Id: Iccdd55d98660903331cf8b7b29188da781830af4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/build_overrides')
| -rw-r--r-- | chromium/build_overrides/build.gni | 8 | ||||
| -rw-r--r-- | chromium/build_overrides/v8.gni | 18 |
2 files changed, 8 insertions, 18 deletions
diff --git a/chromium/build_overrides/build.gni b/chromium/build_overrides/build.gni index 482116ca6f1..69c74536de9 100644 --- a/chromium/build_overrides/build.gni +++ b/chromium/build_overrides/build.gni @@ -13,3 +13,11 @@ mac_deployment_target_build_override = "10.7" # Variable that can be used to support multiple build scenarios, like having # Chromium specific targets in a client project's GN file etc. build_with_chromium = true + +# Uncomment these to specify a different NDK location and version in +# non-Chromium builds. +# default_android_ndk_root = "//third_party/android_tools/ndk" +# default_android_ndk_version = "r10e" + +# Some non-Chromium builds don't support building java targets. +enable_java_templates = true diff --git a/chromium/build_overrides/v8.gni b/chromium/build_overrides/v8.gni index 5920636deb4..af9d9cc6827 100644 --- a/chromium/build_overrides/v8.gni +++ b/chromium/build_overrides/v8.gni @@ -24,21 +24,3 @@ v8_extra_library_files = [ "../third_party/WebKit/Source/core/streams/ReadableStream.js", ] v8_experimental_extra_library_files = [] - -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", - ] - } -} |