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." am: 56e0290551

Browse Source 
am: 6a1ea2e8a3

Change-Id: If663d712cba23eaf572ec374c69ac14ecd11b9d9
This commit is contained in:
Nicolas Geoffray
2019-02-25 22:08:07 -08:00
committed by android-build-merger
parent 754b5a313d 6a1ea2e8a3
commit b60ce369b3
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
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 {
global := dexpreoptGlobalConfig(ctx)
if !global.UseProfileForBootImage || ctx.Config().IsPdkBuild() || ctx.Config().UnbundledBuild() {
return nil
}
return ctx.Config().Once(bootImageProfileRuleKey, func() interface{} { return ctx.Config().Once(bootImageProfileRuleKey, func() interface{} {
global := dexpreoptGlobalConfig(ctx)
if !global.UseProfileForBootImage || ctx.Config().IsPdkBuild() || ctx.Config().UnbundledBuild() {
return nil
}
tools := global.Tools tools := global.Tools
rule := android.NewRuleBuilder() rule := android.NewRuleBuilder()