commit 0feed89b7c54d71025d63140927bc8f93df333ef
author Jaewoong Jung <jungjw@google.com> Tue May 26 20:10:08 2020 -0700
committer Jaewoong Jung <jungjw@google.com> Wed May 27 14:45:37 2020 -0700
tree 92d52d4f90527540b73157fe17ea8313653f342b
parent 07d215215bb70c9d4640949967f74c7c27216ff2

Make android_app_import multi targets arch module.

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

(This is a cherry-pick change.)

Bug: 154281342
Test: TreeHugger
Test: chromium-webview
Change-Id: I1575d9ef3f8596f1eb8db0867db09de08945d711
Merged-In: I1575d9ef3f8596f1eb8db0867db09de08945d711

java/app.go

diff --git a/java/app.go b/java/app.go
index e585dc8..e8f0159 100755
--- a/java/app.go
+++ b/java/app.go
@@ -1577,7 +1577,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