Commit 451bfe3c authored by Clark DuVall's avatar Clark DuVall Committed by Commit Bot

Reland "Enable isolated splits in canary"

This is a reland of b9d174e5

There were issues uploading to the Play console which should now be
fixed, see crbug.com/1141430 for more details.

Original change's description:
> Enable isolated splits in canary
>
> All known issues have been fixed so enabling this in canary to see if
> there are any major problems.
>
> Bug: 1126301
> Change-Id: I0c3bc7443fcca8b81f7c2652d90b982872f7ea08
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2478144
> Commit-Queue: Clark DuVall <cduvall@chromium.org>
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#819200}

TBR=agrieve@chromium.org

Bug: 1126301
Change-Id: Idff90dadf9a5b1ec3cf047db1ce25d85cf8faf2e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2493460Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#820246}
parent e42ee457
...@@ -3,8 +3,13 @@ apk_path=lib/arm64-v8a/libmonochrome.so, compress=False, alignment=4096 ...@@ -3,8 +3,13 @@ apk_path=lib/arm64-v8a/libmonochrome.so, compress=False, alignment=4096
apk_path=lib/armeabi-v7a/libarcore_sdk_c.so, compress=False, alignment=4096 apk_path=lib/armeabi-v7a/libarcore_sdk_c.so, compress=False, alignment=4096
apk_path=lib/armeabi-v7a/libcrashpad_handler_trampoline.so, compress=False, alignment=4096 apk_path=lib/armeabi-v7a/libcrashpad_handler_trampoline.so, compress=False, alignment=4096
apk_path=lib/armeabi-v7a/libmonochrome.so, compress=False, alignment=4096 apk_path=lib/armeabi-v7a/libmonochrome.so, compress=False, alignment=4096
apk_path=lib/armeabi-v7a/libmonochrome_cablev2_authenticator_partition.so, compress=False, alignment=4096
apk_path=lib/armeabi-v7a/libmonochrome_stack_unwinder_partition.so, compress=False, alignment=4096
apk_path=lib/armeabi-v7a/libmonochrome_test_dummy_partition.so, compress=False, alignment=4096
apk_path=lib/armeabi-v7a/libmonochrome_vr_partition.so, compress=False, alignment=4096
apk_path=assets/chrome_100_percent.pak, compress=False, alignment=4 apk_path=assets/chrome_100_percent.pak, compress=False, alignment=4
apk_path=assets/icudtl.dat, compress=False, alignment=4 apk_path=assets/icudtl.dat, compress=False, alignment=4
apk_path=assets/icudtl_extra.dat, compress=False, alignment=4
apk_path=assets/locales/af.pak, compress=False, alignment=4 apk_path=assets/locales/af.pak, compress=False, alignment=4
apk_path=assets/locales/am.pak, compress=False, alignment=4 apk_path=assets/locales/am.pak, compress=False, alignment=4
apk_path=assets/locales/ar.pak, compress=False, alignment=4 apk_path=assets/locales/ar.pak, compress=False, alignment=4
......
apk_path=lib/armeabi-v7a/libarcore_sdk_c.so, compress=False, alignment=4096 apk_path=lib/armeabi-v7a/libarcore_sdk_c.so, compress=False, alignment=4096
apk_path=lib/armeabi-v7a/libchromium_android_linker.so, compress=False, alignment=4096 apk_path=lib/armeabi-v7a/libchromium_android_linker.so, compress=False, alignment=4096
apk_path=lib/armeabi-v7a/libmonochrome_cablev2_authenticator_partition.so, compress=False, alignment=4096
apk_path=lib/armeabi-v7a/libmonochrome_stack_unwinder_partition.so, compress=False, alignment=4096
apk_path=lib/armeabi-v7a/libmonochrome_test_dummy_partition.so, compress=False, alignment=4096
apk_path=lib/armeabi-v7a/libmonochrome_vr_partition.so, compress=False, alignment=4096
apk_path=assets/chrome_100_percent.pak, compress=False, alignment=4 apk_path=assets/chrome_100_percent.pak, compress=False, alignment=4
apk_path=assets/icudtl_extra.dat, compress=False, alignment=4
apk_path=assets/locales/af.pak, compress=False, alignment=4 apk_path=assets/locales/af.pak, compress=False, alignment=4
apk_path=assets/locales/am.pak, compress=False, alignment=4 apk_path=assets/locales/am.pak, compress=False, alignment=4
apk_path=assets/locales/ar.pak, compress=False, alignment=4 apk_path=assets/locales/ar.pak, compress=False, alignment=4
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
# 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/android/channel.gni")
import("//build/config/android/config.gni") import("//build/config/android/config.gni")
import("//build/config/compiler/compiler.gni") import("//build/config/compiler/compiler.gni")
import("//device/vr/buildflags/buildflags.gni") import("//device/vr/buildflags/buildflags.gni")
...@@ -10,7 +11,10 @@ declare_args() { ...@@ -10,7 +11,10 @@ declare_args() {
# Whether //chrome code and resources are in a DFM for Monochrome and # Whether //chrome code and resources are in a DFM for Monochrome and
# Trichrome bundles. This module will also include code and resources from all # Trichrome bundles. This module will also include code and resources from all
# other DFMs. # other DFMs.
enable_chrome_module = false # TODO(crbug.com/1126301): The binary size tools need to be updated to include
# DFM code before this can be enabled on stable.
enable_chrome_module =
android_channel == "default" || android_channel == "canary"
} }
# If true, lld is used to partition feature code into separate libraries, which # If true, lld is used to partition feature code into separate libraries, which
......
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