aboutsummaryrefslogtreecommitdiffstats
path: root/java/dexpreopt.go
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2019-04-04 18:45:20 +0100
committerNicolas Geoffray <ngeoffray@google.com>2019-04-04 18:50:56 +0100
commit25c0e03520f40a5aa0b0525715297fa1f09f8f03 (patch)
treebeddfd04c2419be88e5a2597ffa81459ae76853d /java/dexpreopt.go
parentf3f1467051d8839629ccf0b9aeda3f8a5997c834 (diff)
downloadbuild_soong-25c0e03520f40a5aa0b0525715297fa1f09f8f03.tar.gz
build_soong-25c0e03520f40a5aa0b0525715297fa1f09f8f03.tar.bz2
build_soong-25c0e03520f40a5aa0b0525715297fa1f09f8f03.zip
Use the apex image when the device config asks for it.
Test: lunch walleye_jitzygote-userdebug m && all odex file use the apex image Bug: 119800099 Change-Id: Id2fff6a4569d48b8e6a886cb82bdba205b0dd56a
Diffstat (limited to 'java/dexpreopt.go')
-rw-r--r--java/dexpreopt.go3
1 files changed, 3 insertions, 0 deletions
diff --git a/java/dexpreopt.go b/java/dexpreopt.go
index ecb24215..6b93c10e 100644
--- a/java/dexpreopt.go
+++ b/java/dexpreopt.go
@@ -98,6 +98,9 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo
global := dexpreoptGlobalConfig(ctx)
bootImage := defaultBootImageConfig(ctx)
+ if global.UseApexImage {
+ bootImage = apexBootImageConfig(ctx)
+ }
var archs []android.ArchType
for _, a := range ctx.MultiTargets() {