Remove old-style support for translated second architectures
Translated second architectures now go in NativeBridgeArch instead of DeviceSecondaryArch. Bug: 141242600 Test: m checkbuild Change-Id: I568046330abc002d4eed582cb999b62a5eaba790
This commit is contained in:
@@ -126,10 +126,6 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo
|
||||
archs = archs[:1]
|
||||
}
|
||||
}
|
||||
if ctx.Config().SecondArchIsTranslated() {
|
||||
// Only preopt primary arch for translated arch since there is only an image there.
|
||||
archs = archs[:1]
|
||||
}
|
||||
|
||||
var images android.Paths
|
||||
var imagesDeps []android.Paths
|
||||
|
@@ -87,11 +87,7 @@ var systemServerClasspathKey = android.NewOnceKey("systemServerClasspath")
|
||||
// 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
|
||||
}
|
||||
|
||||
for _, target := range ctx.Config().Targets[android.Android] {
|
||||
if target.NativeBridge == android.NativeBridgeDisabled {
|
||||
targets = append(targets, target)
|
||||
}
|
||||
|
Reference in New Issue
Block a user