commit | 940ef19f77ed30fb1b3c850ef4f880420a6fb456 | [log] [tgz] |
---|---|---|
author | Ulyana Trafimovich <skvadrik@google.com> | Mon Nov 04 12:04:04 2019 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Nov 04 12:04:04 2019 +0000 |
tree | 67cdf3cfb697feacd9f9fa32b8ed3d032a713f26 | |
parent | 5622d5351d6570e897dc4c6cdaa4c8a5f371008a [diff] | |
parent | acb33e0b6582bebbbeeb7028b9257f373b5fcbcc [diff] |
Merge "Disable dexpreopt on targets that do not include default ART config."
diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go index 3d7f36c..74ef667 100644 --- a/java/dexpreopt_bootjars.go +++ b/java/dexpreopt_bootjars.go
@@ -123,6 +123,10 @@ } func skipDexpreoptBootJars(ctx android.PathContext) bool { + if dexpreoptGlobalConfig(ctx).DisablePreopt { + return true + } + if ctx.Config().UnbundledBuild() { return true }