From 6abfbf7f9c9b71179e90d9fbb0cbf24a597551cc Mon Sep 17 00:00:00 2001
From: Jaewoong Jung <jungjw@google.com>
Date: Tue, 26 May 2020 20:10:08 -0700
Subject: [PATCH] Make android_app_import multi targets arch module.

I made a mistake and only fixed android_test_import in my previous
change, I5bbb2d2b733bbd6b868898285683ba5ff45be10b.

Bug: 154281342
Test: TreeHugger
Test: chromium-webview
Change-Id: I1575d9ef3f8596f1eb8db0867db09de08945d711
---
 java/app.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/app.go b/java/app.go
index 8241b6842..7f42c2963 100755
--- a/java/app.go
+++ b/java/app.go
@@ -1613,7 +1613,8 @@ func AndroidAppImportFactory() 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