diff options
| author | Colin Cross <ccross@android.com> | 2018-10-02 13:53:33 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-10-03 14:31:10 -0700 |
| commit | 48de9a4ef5441dc4013ed7a68218bc47f98483d4 (patch) | |
| tree | 210427380e52b3baebc1824d812fca3515d781ff /java/java.go | |
| parent | b83de950e786848267ba9250e5ff98aa2a2737e8 (diff) | |
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
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/java/java.go b/java/java.go index 8b354d91d..b4b8feb23 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) |