diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/aar.go | 5 | ||||
| -rw-r--r-- | java/java.go | 14 | ||||
| -rw-r--r-- | java/sdk_library.go | 3 |
3 files changed, 14 insertions, 8 deletions
diff --git a/java/aar.go b/java/aar.go index 29f5597a..35fb96f7 100644 --- a/java/aar.go +++ b/java/aar.go @@ -359,7 +359,7 @@ func AndroidLibraryFactory() android.Module { module.androidLibraryProperties.BuildAAR = true - android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon) + InitJavaModule(module, android.DeviceSupported) return module } @@ -382,6 +382,7 @@ type AARImportProperties struct { type AARImport struct { android.ModuleBase + android.DefaultableModuleBase prebuilt android.Prebuilt properties AARImportProperties @@ -555,6 +556,6 @@ func AARImportFactory() android.Module { module.AddProperties(&module.properties) android.InitPrebuiltModule(module, &module.properties.Aars) - android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon) + InitJavaModule(module, android.DeviceSupported) return module } diff --git a/java/java.go b/java/java.go index 8b354d91..b4b8feb2 100644 --- a/java/java.go +++ b/java/java.go @@ -1493,7 +1493,6 @@ func TestFactory() android.Module { module.Module.properties.Installable = proptools.BoolPtr(true) InitJavaModule(module, android.HostAndDeviceSupported) - android.InitDefaultableModule(module) return module } @@ -1508,7 +1507,6 @@ func TestHostFactory() android.Module { module.Module.properties.Installable = proptools.BoolPtr(true) InitJavaModule(module, android.HostSupported) - android.InitDefaultableModule(module) return module } @@ -1624,6 +1622,7 @@ type ImportProperties struct { type Import struct { android.ModuleBase + android.DefaultableModuleBase prebuilt android.Prebuilt properties ImportProperties @@ -1752,7 +1751,7 @@ func ImportFactory() android.Module { module.AddProperties(&module.properties) android.InitPrebuiltModule(module, &module.properties.Jars) - android.InitAndroidArchModule(module, android.HostAndDeviceSupported, android.MultilibCommon) + InitJavaModule(module, android.HostAndDeviceSupported) return module } @@ -1762,7 +1761,7 @@ func ImportFactoryHost() android.Module { module.AddProperties(&module.properties) android.InitPrebuiltModule(module, &module.properties.Jars) - android.InitAndroidArchModule(module, android.HostSupported, android.MultilibCommon) + InitJavaModule(module, android.HostSupported) return module } @@ -1792,6 +1791,13 @@ func DefaultsFactory(props ...interface{}) android.Module { &CompilerProperties{}, &CompilerDeviceProperties{}, &android.ProtoProperties{}, + &aaptProperties{}, + &androidLibraryProperties{}, + &appProperties{}, + &appTestProperties{}, + &ImportProperties{}, + &AARImportProperties{}, + &sdkLibraryProperties{}, ) android.InitDefaultsModule(module) diff --git a/java/sdk_library.go b/java/sdk_library.go index 3e6908bd..a8c3b118 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -691,7 +691,6 @@ func sdkLibraryFactory() android.Module { module := &sdkLibrary{} module.AddProperties(&module.properties) module.AddProperties(&module.deviceProperties) - android.InitAndroidArchModule(module, android.DeviceSupported, android.MultilibCommon) - android.InitDefaultableModule(module) + InitJavaModule(module, android.DeviceSupported) return module } |