Commit ef30a3c9 authored by Mohamed Heikal's avatar Mohamed Heikal Committed by Commit Bot

Fix gn flags around check_android_configuration

This cl fixes an issue where it is not possible to build a stable
channel public build without enabling check_android_configuration (due
to gn failure from useless assignments).

Change-Id: I5b2ecf2a9d9529b75383b2a498e4a6240a89c186
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2090139
Auto-Submit: Mohamed Heikal <mheikal@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#747818}
parent 2bd9927b
...@@ -2440,8 +2440,10 @@ template("monochrome_or_trichrome_public_bundle_tmpl") { ...@@ -2440,8 +2440,10 @@ template("monochrome_or_trichrome_public_bundle_tmpl") {
if (defined(invoker.verify_android_configuration) && if (defined(invoker.verify_android_configuration) &&
invoker.verify_android_configuration) { invoker.verify_android_configuration) {
verify_manifest = true verify_manifest = true
failed_manifest_expectation_file = if (check_android_configuration) {
"monochrome_public_bundle.android_manifest.failed" failed_manifest_expectation_file =
"monochrome_public_bundle.android_manifest.failed"
}
} }
if (!_is_trichrome || if (!_is_trichrome ||
...@@ -2473,8 +2475,10 @@ template("monochrome_or_trichrome_public_bundle_tmpl") { ...@@ -2473,8 +2475,10 @@ template("monochrome_or_trichrome_public_bundle_tmpl") {
if (defined(invoker.verify_android_configuration) && if (defined(invoker.verify_android_configuration) &&
invoker.verify_android_configuration) { invoker.verify_android_configuration) {
verify_proguard_flags = true verify_proguard_flags = true
failed_proguard_expectation_file = if (check_android_configuration) {
"monochrome_public_bundle.proguard_flags.failed" failed_proguard_expectation_file =
"monochrome_public_bundle.proguard_flags.failed"
}
} }
} }
} }
......
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