commit 06e36c737f293534dc9a72e4af9157387111467d
author Treehugger Robot <treehugger-gerrit@google.com> Mon Aug 20 22:21:32 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 20 22:21:32 2018 +0000
tree f0de5fe39d0467274d9326bff2401b367817a25d
parent 910fff22e638921a28f5e0991f28f7ae62396ede
parent b98c0f4c7dd75867544fd8f31c6ed510e65140a1

Merge "Fix using defaults in android_app and android_test modules"

java/app.go

diff --git a/java/app.go b/java/app.go
index 78d526d..3f72ec9 100644
--- a/java/app.go
+++ b/java/app.go
@@ -208,7 +208,7 @@
 		&module.aaptProperties,
 		&module.appProperties)
 
-	android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
+	InitJavaModule(module, android.DeviceSupported)
 	return module
 }
 
@@ -261,7 +261,6 @@
 		&module.appTestProperties,
 		&module.testProperties)
 
-	android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
-
+	InitJavaModule(module, android.DeviceSupported)
 	return module
 }