Commit d635e42a authored by Andrew Grieve's avatar Andrew Grieve Committed by Commit Bot

Revert "Android: Fix gn gen failure for official builds when...

Revert "Android: Fix gn gen failure for official builds when check_android_configuration is not set"

This reverts commit 0182397a.

Reason for revert: Breaks errors showing up in local builds
Note: I can't repro any gn gen failures with this reverted.

Original change's description:
> Android: Fix gn gen failure for official builds when check_android_configuration is not set
> 
> Was hitting this locally:
> 2019-10-22 04:06:38 -0400 ERROR at //chrome/android/BUILD.gn:2339:11: Assignment had no effect.
> 2019-10-22 04:06:38 -0400           "monochrome_public_bundle.android_manifest.failed"
> 2019-10-22 04:06:38 -0400           ^-------------------------------------------------
> 
> Bug: 1011227
> Change-Id: I850fc129d8c2e1c7190266735f2fab97f7efebc8
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1873240
> Commit-Queue: Mohamed Heikal <mheikal@chromium.org>
> Auto-Submit: Andrew Grieve <agrieve@chromium.org>
> Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#708221}

TBR=agrieve@chromium.org,mheikal@chromium.org
Bug: 1011227, 1048319

Change-Id: I5968e52f00891fd91377403d830d76b41766610b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2037329Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#738337}
parent ea6ce050
......@@ -2449,8 +2449,7 @@ if (public_android_sdk) {
# Having //clank present causes different flags because of how play services
# is wired up.
# The channel is required because manifest entries vary based on channel.
if (check_android_configuration && !enable_chrome_android_internal &&
android_channel == "stable") {
if (!enable_chrome_android_internal && android_channel == "stable") {
verify_android_configuration = true
}
}
......
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