Commit 2b5b4772 authored by Clark DuVall's avatar Clark DuVall Committed by Commit Bot

Reland "Enable isolated splits in canary and dev"

This is a reland of c7a74ee0

Fix for Play Store upload issue is in http://crrev.com/c/2545725. Will
submit this after that lands.

Original change's description:
> Enable isolated splits in canary and dev
>
> All major crashes have been fixed and numbers look good. M88 branch was
> just cut, so should be safe to enable now.
>
> Bug: 1126301
> Change-Id: I351d565e68f14af2411c71fa80f34852bab5455a
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2529729
> Reviewed-by: Andrew Grieve <agrieve@chromium.org>
> Commit-Queue: Clark DuVall <cduvall@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#827387}

Bug: 1126301
Change-Id: If28e00dae4bf5e81ef22751ae394c3bb4a200908
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2545870Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#829056}
parent 119eb5ad
...@@ -3,6 +3,10 @@ apk_path=lib/arm64-v8a/libmonochrome.so, compress=False, alignment=4096 ...@@ -3,6 +3,10 @@ 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/locales/af.pak, compress=False, alignment=4 apk_path=assets/locales/af.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/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
......
...@@ -13,7 +13,8 @@ declare_args() { ...@@ -13,7 +13,8 @@ declare_args() {
# other DFMs. # other DFMs.
# TODO(crbug.com/1126301): The binary size tools need to be updated to include # TODO(crbug.com/1126301): The binary size tools need to be updated to include
# DFM code before this can be enabled on stable. # DFM code before this can be enabled on stable.
enable_chrome_module = false enable_chrome_module = android_channel == "default" ||
android_channel == "canary" || android_channel == "dev"
# Whether to enable DFMs which depend on the chrome DFM. These will be split # Whether to enable DFMs which depend on the chrome DFM. These will be split
# out of the chrome DFM using DexSplitter. # out of the chrome DFM using DexSplitter.
......
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