Add native_bridge target to Android.bp
This allows us to build guest libraries for the native bridge for arm/arm64 architectures. Bug: http://b/77159578 Test: make Change-Id: I35520ca456105ddadd456c78a4eb1e6de39147c5
This commit is contained in:
@@ -111,7 +111,9 @@ func (d *dexpreopter) dexpreopt(ctx android.ModuleContext, dexJarFile android.Mo
|
||||
if len(archs) == 0 {
|
||||
// assume this is a java library, dexpreopt for all arches for now
|
||||
for _, target := range ctx.Config().Targets[android.Android] {
|
||||
archs = append(archs, target.Arch.ArchType)
|
||||
if target.NativeBridge == android.NativeBridgeDisabled {
|
||||
archs = append(archs, target.Arch.ArchType)
|
||||
}
|
||||
}
|
||||
if inList(ctx.ModuleName(), global.SystemServerJars) && !d.isSDKLibrary {
|
||||
// If the module is not an SDK library and it's a system server jar, only preopt the primary arch.
|
||||
|
@@ -197,8 +197,10 @@ func buildBootImage(ctx android.SingletonContext, config bootImageConfig) *bootI
|
||||
}
|
||||
|
||||
for _, target := range targets {
|
||||
files := buildBootImageRuleForArch(ctx, image, target.Arch.ArchType, profile, missingDeps)
|
||||
allFiles = append(allFiles, files.Paths()...)
|
||||
if target.NativeBridge == android.NativeBridgeDisabled {
|
||||
files := buildBootImageRuleForArch(ctx, image, target.Arch.ArchType, profile, missingDeps)
|
||||
allFiles = append(allFiles, files.Paths()...)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user