diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2019-04-04 18:45:20 +0100 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2019-04-05 13:57:47 +0100 |
| commit | 0ebdd3430e8c2a49544596c6d100c2942c81c38e (patch) | |
| tree | ff5f673c251c59348f4301b2d62cca3f62729317 /java | |
| parent | c4bd0a266392c953f59df782cbb7e536c00b31af (diff) | |
| download | build_soong-0ebdd3430e8c2a49544596c6d100c2942c81c38e.tar.gz build_soong-0ebdd3430e8c2a49544596c6d100c2942c81c38e.tar.bz2 build_soong-0ebdd3430e8c2a49544596c6d100c2942c81c38e.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
(cherry picked from commit 25c0e03520f40a5aa0b0525715297fa1f09f8f03)
Change-Id: I901ed57136885f87470d1ee398b92972151547f2
Merged-In: Id2fff6a4569d48b8e6a886cb82bdba205b0dd56a
Diffstat (limited to 'java')
| -rw-r--r-- | java/dexpreopt.go | 3 |
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() { |