Merge "DO NOT MERGE - Merge Pie Bonito/Sargo into master."
diff --git a/Android.bp b/Android.bp
index afac2b5..e2d606e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -638,6 +638,7 @@
kernel_headers {
name: "device_kernel_headers",
vendor: true,
+ recovery_available: true,
}
cc_genrule {
diff --git a/java/dexpreopt_bootjars.go b/java/dexpreopt_bootjars.go
index 092a133..f48428f 100644
--- a/java/dexpreopt_bootjars.go
+++ b/java/dexpreopt_bootjars.go
@@ -56,6 +56,7 @@
dexPaths android.WritablePaths
dir android.OutputPath
symbolsDir android.OutputPath
+ targets []android.Target
images map[android.ArchType]android.OutputPath
zip android.WritablePath
}
@@ -191,16 +192,9 @@
var allFiles android.Paths
if !global.DisablePreopt {
- targets := ctx.Config().Targets[android.Android]
- if ctx.Config().SecondArchIsTranslated() {
- targets = targets[:1]
- }
-
- for _, target := range targets {
- if target.NativeBridge == android.NativeBridgeDisabled {
- files := buildBootImageRuleForArch(ctx, image, target.Arch.ArchType, profile, missingDeps)
- allFiles = append(allFiles, files.Paths()...)
- }
+ for _, target := range image.targets {
+ files := buildBootImageRuleForArch(ctx, image, target.Arch.ArchType, profile, missingDeps)
+ allFiles = append(allFiles, files.Paths()...)
}
}
diff --git a/java/dexpreopt_config.go b/java/dexpreopt_config.go
index a0b1ea5..270fcb4 100644
--- a/java/dexpreopt_config.go
+++ b/java/dexpreopt_config.go
@@ -72,6 +72,23 @@
var systemServerClasspathKey = android.NewOnceKey("systemServerClasspath")
+// dexpreoptTargets returns the list of targets that are relevant to dexpreopting, which excludes architectures
+// supported through native bridge.
+func dexpreoptTargets(ctx android.PathContext) []android.Target {
+ var targets []android.Target
+ for i, target := range ctx.Config().Targets[android.Android] {
+ if ctx.Config().SecondArchIsTranslated() && i > 0 {
+ break
+ }
+
+ if target.NativeBridge == android.NativeBridgeDisabled {
+ targets = append(targets, target)
+ }
+ }
+
+ return targets
+}
+
// defaultBootImageConfig returns the bootImageConfig that will be used to dexpreopt modules. It is computed once the
// first time it is called for any ctx.Config(), and returns the same slice for all future calls with the same
// ctx.Config().
@@ -113,7 +130,9 @@
images := make(map[android.ArchType]android.OutputPath)
zip := dir.Join(ctx, "boot.zip")
- for _, target := range ctx.Config().Targets[android.Android] {
+ targets := dexpreoptTargets(ctx)
+
+ for _, target := range targets {
images[target.Arch.ArchType] = dir.Join(ctx,
"system/framework", target.Arch.ArchType.String()).Join(ctx, "boot.art")
}
@@ -126,6 +145,7 @@
dir: dir,
symbolsDir: symbolsDir,
images: images,
+ targets: targets,
zip: zip,
}
}).(bootImageConfig)
@@ -168,7 +188,9 @@
symbolsDir := android.PathForOutput(ctx, ctx.Config().DeviceName(), "dex_apexjars_unstripped")
images := make(map[android.ArchType]android.OutputPath)
- for _, target := range ctx.Config().Targets[android.Android] {
+ targets := dexpreoptTargets(ctx)
+
+ for _, target := range targets {
images[target.Arch.ArchType] = dir.Join(ctx,
"system/framework", target.Arch.ArchType.String(), "apex.art")
}
@@ -180,6 +202,7 @@
dexPaths: bootDexPaths,
dir: dir,
symbolsDir: symbolsDir,
+ targets: targets,
images: images,
}
}).(bootImageConfig)