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

Android: Fix gn gen failure with !is_debug && incremental_install

Bug: 1027514
Change-Id: I0c4cbb90fae9cc3eecbeeb8f0e8c36702cbcf60b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1931153
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Commit-Queue: Eric Stevenson <estevenson@chromium.org>
Auto-Submit: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: default avatarEric Stevenson <estevenson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#718261}
parent 07d3d555
...@@ -2946,6 +2946,18 @@ if (enable_java_templates) { ...@@ -2946,6 +2946,18 @@ if (enable_java_templates) {
if (defined(invoker.negative_main_dex_globs)) { if (defined(invoker.negative_main_dex_globs)) {
not_needed(invoker, [ "negative_main_dex_globs" ]) not_needed(invoker, [ "negative_main_dex_globs" ])
} }
if (defined(invoker.disable_checkdiscard)) {
not_needed(invoker, [ "disable_checkdiscard" ])
}
if (defined(invoker.disable_r8_outlining)) {
not_needed(invoker, [ "disable_r8_outlining" ])
}
if (defined(invoker.negative_main_dex_globs)) {
not_needed(invoker, [ "negative_main_dex_globs" ])
}
if (defined(invoker.dexlayout_profile)) {
not_needed(invoker, [ "dexlayout_profile" ])
}
} else { } else {
# Dex generation for app bundle modules with proguarding enabled takes # Dex generation for app bundle modules with proguarding enabled takes
# place later due to synchronized proguarding. For more details, # place later due to synchronized proguarding. For more details,
......
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