Make more java modules defaultable
Make java_import, android_library and android_library_import modules
defaultable, and add some missing property structs to java_defaults.
Also use InitJavaModule everywhere.
Test: m checkbuild
Change-Id: I981875bbec5d1f87bae73f36a385e0b77c56c368
diff --git a/java/aar.go b/java/aar.go
index 29f5597..35fb96f 100644
--- a/java/aar.go
+++ b/java/aar.go
@@ -359,7 +359,7 @@
module.androidLibraryProperties.BuildAAR = true
- android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
+ InitJavaModule(module, android.DeviceSupported)
return module
}
@@ -382,6 +382,7 @@
type AARImport struct {
android.ModuleBase
+ android.DefaultableModuleBase
prebuilt android.Prebuilt
properties AARImportProperties
@@ -555,6 +556,6 @@
module.AddProperties(&module.properties)
android.InitPrebuiltModule(module, &module.properties.Aars)
- android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon)
+ InitJavaModule(module, android.DeviceSupported)
return module
}