commit 6abfbf7f9c9b71179e90d9fbb0cbf24a597551cc
author Jaewoong Jung <jungjw@google.com> Tue May 26 20:10:08 2020 -0700
committer Jaewoong Jung <jungjw@google.com> Tue May 26 20:10:08 2020 -0700
tree 446937606adde2be3112853e6af7484a44d98703
parent 649dadfb8759ef1fc4f9c9ddb9221a6c2f6a8cdf

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

diff --git a/java/app.go b/java/app.go
index 8241b68..7f42c29 100755
--- a/java/app.go
+++ b/java/app.go
@@ -1613,7 +1613,8 @@
 	})
 
 	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