From 243688ea1bbab9e428ff7a824825bc7848f8b211 Mon Sep 17 00:00:00 2001 From: Jaewoong Jung Date: Fri, 1 May 2020 15:50:08 -0700 Subject: [PATCH] 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. Test: TreeHugger Bug: 154281342 Change-Id: I5bbb2d2b733bbd6b868898285683ba5ff45be10b --- java/app.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/app.go b/java/app.go index d535c5a67..d25575c99 100755 --- a/java/app.go +++ b/java/app.go @@ -1392,7 +1392,8 @@ func AndroidTestImportFactory() android.Module { }) android.InitApexModule(module) - InitJavaModule(module, android.DeviceSupported) + android.InitAndroidMultiTargetsArchModule(module, android.DeviceSupported, android.MultilibCommon) + android.InitDefaultableModule(module) android.InitSingleSourcePrebuiltModule(module, &module.properties, "Apk") return module