diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2020-02-07 14:19:28 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2020-02-07 14:19:28 +0000 |
| commit | 73d5983af061e3ded84365edb7408b8f4f08f17e (patch) | |
| tree | 666c5bd578eefbcf786b86e7ba74721c12b5737d /java/dexpreopt_bootjars.go | |
| parent | 396b950a1b4711eb3e52b58a227c1846dc493e17 (diff) | |
| download | build_soong-73d5983af061e3ded84365edb7408b8f4f08f17e.tar.gz build_soong-73d5983af061e3ded84365edb7408b8f4f08f17e.tar.bz2 build_soong-73d5983af061e3ded84365edb7408b8f4f08f17e.zip | |
Remove UseApexImage and GenerateApexImage.
These options are not used anymore.
Bug: 119800099
Test: m
Change-Id: I4568ff23ed71a5c288ed87828aed6e4bc4f8bd4d
Diffstat (limited to 'java/dexpreopt_bootjars.go')
| -rw-r--r-- | java/dexpreopt_bootjars.go | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go index 87f6d5e3..607a4378 100644 --- a/java/dexpreopt_bootjars.go +++ b/java/dexpreopt_bootjars.go @@ -197,13 +197,6 @@ func DexpreoptedArtApexJars(ctx android.BuilderContext) map[android.ArchType]and // Include dexpreopt files for the primary boot image. files := artBootImageConfig(ctx).imagesDeps - // For JIT-zygote config, also include dexpreopt files for the primary JIT-zygote image. - if dexpreoptGlobalConfig(ctx).UseApexImage { - for arch, paths := range artJZBootImageConfig(ctx).imagesDeps { - files[arch] = append(files[arch], paths...) - } - } - return files } @@ -232,11 +225,6 @@ func (d *dexpreoptBootJars) GenerateBuildActions(ctx android.SingletonContext) { d.defaultBootImage = buildBootImage(ctx, defaultBootImageConfig(ctx)) // Create boot image for the ART apex (build artifacts are accessed via the global boot image config). d.otherImages = append(d.otherImages, buildBootImage(ctx, artBootImageConfig(ctx))) - if global.GenerateApexImage { - // Create boot images for the JIT-zygote experiment. - d.otherImages = append(d.otherImages, buildBootImage(ctx, artJZBootImageConfig(ctx))) - d.otherImages = append(d.otherImages, buildBootImage(ctx, frameworkJZBootImageConfig(ctx))) - } dumpOatRules(ctx, d.defaultBootImage) } |