Skip to content

Commit

Permalink
Reland "[WebLayer] Enable WebLayer in split on canary"
Browse files Browse the repository at this point in the history
This is a reland of 7cfe51d

The build error should be fixed by https://crrev.com/c/2416892

Original change's description:
> [WebLayer] Enable WebLayer in split on canary
>
> This enables WebLayer in a split in WebView bundles in canary. I tested
> on L-Q and ran all instrumentation tests on P with this setup.
>
> Bug: 1105096
> Change-Id: I517bce4109531108a4fb3af64a87aa1f5d2a91bb
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2412705
> Reviewed-by: Scott Violet <sky@chromium.org>
> Commit-Queue: Clark DuVall <cduvall@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#807252}

Bug: 1105096
Change-Id: I0d179670f0979809866ae278d7a4e6fd7a58dfbe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2416878
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#807995}
  • Loading branch information
clarkduvall authored and Commit Bot committed Sep 17, 2020
1 parent 804823a commit 7854f25
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion weblayer/variables.gni
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.

import("//build/config/android/channel.gni")

declare_args() {
# Include the //weblayer code in WebView implementation APKs.
webview_includes_weblayer = true

# Whether WebLayer will be included as a DFM.
weblayer_in_split = false
weblayer_in_split =
android_channel == "default" || android_channel == "canary"
}

weblayer_product_config_java_package = "org.chromium.weblayer_private"

0 comments on commit 7854f25

Please sign in to comment.