summaryrefslogtreecommitdiff
path: root/java/dexpreopt.go
diff options
context:
space:
mode:
author dimitry <dimitry@google.com> 2019-03-26 12:39:31 +0100
committer dimitry <dimitry@google.com> 2019-05-03 15:33:28 +0200
commit1f33e40972c18255188ca02877fb44e633cf2782 (patch)
treee69a2b23872dacf064ac8ed1f5221691cac91c19 /java/dexpreopt.go
parent0e7dbebe7e4207478448edf5dc39c6ece5319895 (diff)
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
Diffstat (limited to 'java/dexpreopt.go')
-rw-r--r--java/dexpreopt.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/java/dexpreopt.go b/java/dexpreopt.go
index a7938c82c..08fd06ed6 100644
--- a/java/dexpreopt.go
+++ b/java/dexpreopt.go
@@ -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.