diff options
| author | 2019-06-26 16:44:38 +0000 | |
|---|---|---|
| committer | 2019-06-26 16:44:38 +0000 | |
| commit | d3f688b521438556f62495d2ed7cacc3a2768b36 (patch) | |
| tree | a40e08566c7195947db5b484a642b7758ce137f1 /java/dexpreopt_bootjars.go | |
| parent | 4a0473175e51b0441a0adf3854326e21a9d67e75 (diff) | |
Revert "Remove option to create boot image based on preloaded classes"
This reverts commit 4a0473175e51b0441a0adf3854326e21a9d67e75.
Reason for revert: NDK build broken
Change-Id: Id98bf9d5f82ed72d8c489264cf9d754e8ea1d27e
Diffstat (limited to 'java/dexpreopt_bootjars.go')
| -rw-r--r-- | java/dexpreopt_bootjars.go | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go index 4758c7e47..eb735c162 100644 --- a/java/dexpreopt_bootjars.go +++ b/java/dexpreopt_bootjars.go @@ -286,6 +286,8 @@ func buildBootImageRuleForArch(ctx android.SingletonContext, image *bootImage, if profile != nil { cmd.FlagWithArg("--compiler-filter=", "speed-profile") cmd.FlagWithInput("--profile-file=", profile) + } else if global.PreloadedClasses.Valid() { + cmd.FlagWithInput("--image-classes=", global.PreloadedClasses.Path()) } if global.DirtyImageObjects.Valid() { @@ -372,7 +374,7 @@ Rebuild with ART_BOOT_IMAGE_EXTRA_ARGS="--runtime-arg -verbose:verifier" to see func bootImageProfileRule(ctx android.SingletonContext, image *bootImage, missingDeps []string) android.WritablePath { global := dexpreoptGlobalConfig(ctx) - if ctx.Config().IsPdkBuild() || ctx.Config().UnbundledBuild() { + if !global.UseProfileForBootImage || ctx.Config().IsPdkBuild() || ctx.Config().UnbundledBuild() { return nil } return ctx.Config().Once(bootImageProfileRuleKey, func() interface{} { |