StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't return null for an interface type."

Browse Source
This commit is contained in:
Nicolas Geoffray
2019-02-24 21:42:38 +00:00
committed by Gerrit Code Review
parent 9ce7e58c04 27c7cc6c32
commit 56e0290551
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/dexpreopt_bootjars.go
View File

@@ -335,13 +335,12 @@ It is likely that the boot classpath is inconsistent.
Rebuild with ART_BOOT_IMAGE_EXTRA_ARGS="--runtime-arg -verbose:verifier" to see verification errors.` Rebuild with ART_BOOT_IMAGE_EXTRA_ARGS="--runtime-arg -verbose:verifier" to see verification errors.`
func bootImageProfileRule(ctx android.SingletonContext, image *bootImage, missingDeps []string) android.WritablePath { func bootImageProfileRule(ctx android.SingletonContext, image *bootImage, missingDeps []string) android.WritablePath {
return ctx.Config().Once(bootImageProfileRuleKey, func() interface{} {
global := dexpreoptGlobalConfig(ctx) global := dexpreoptGlobalConfig(ctx)
if !global.UseProfileForBootImage || ctx.Config().IsPdkBuild() || ctx.Config().UnbundledBuild() { if !global.UseProfileForBootImage || ctx.Config().IsPdkBuild() || ctx.Config().UnbundledBuild() {
return nil return nil
} }
return ctx.Config().Once(bootImageProfileRuleKey, func() interface{} {
tools := global.Tools tools := global.Tools
rule := android.NewRuleBuilder() rule := android.NewRuleBuilder()