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

parent 388d39ba

java/app.go

+2 −1

Original line number	Diff line number	Diff line
		@@ -1389,7 +1389,8 @@ func AndroidTestImportFactory() android.Module {
		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