commit a689ffe20796165210c34a80c99dc754b19ecaea
author Jaewoong Jung <jungjw@google.com> Fri May 01 15:50:08 2020 -0700
committer Jaewoong Jung <jungjw@google.com> Wed May 06 15:19:42 2020 -0700
tree 1cfc7e90286f6389180882e6feef12f65b145e90
parent 388d39ba9a13db914a26d70a92e6074216842b43

Make android_app_import multi targets arch module.

This makes it consistent with android_app. Also, most android_app_import
modules with JNI libs target a single arch.

(This is a cherry-pick change.)

Test: TreeHugger
Bug: 154281342
Change-Id: I5bbb2d2b733bbd6b868898285683ba5ff45be10b
Merged-In: I5bbb2d2b733bbd6b868898285683ba5ff45be10b

java/app.go

diff --git a/java/app.go b/java/app.go
index 0c94e23..2a7fde2 100755
--- a/java/app.go
+++ b/java/app.go
@@ -1389,7 +1389,8 @@
 		module.processVariants(ctx)
 	})
 
-	InitJavaModule(module, android.DeviceSupported)
+	android.InitAndroidMultiTargetsArchModule(module, android.DeviceSupported, android.MultilibCommon)
+	android.InitDefaultableModule(module)
 	android.InitSingleSourcePrebuiltModule(module, &module.properties, "Apk")
 
 	return module