Merge "Revert "Split Java libraries per apex""

am: 38b9f76d63

Change-Id: Ifda11df70f28856003fcacd2bc93c92a05824606

1 files changed, 1 insertions, 10 deletions

diff --git a/java/java.go b/java/java.go
index ca6e232be..f3e10bebd 100644
--- a/java/java.go
+++ b/java/java.go
@@ -267,7 +267,6 @@ func (me *CompilerDeviceProperties) EffectiveOptimizeEnabled() bool {
 type Module struct {
 	android.ModuleBase
 	android.DefaultableModuleBase
-	android.ApexModuleBase
 
 	properties       CompilerProperties
 	protoProperties  android.ProtoProperties
@@ -1582,7 +1581,6 @@ func LibraryFactory() android.Module {
 		&module.Module.protoProperties)
 
 	InitJavaModule(module, android.HostAndDeviceSupported)
-	android.InitApexModule(module)
 	return module
 }
 
@@ -1605,7 +1603,6 @@ func LibraryHostFactory() android.Module {
 	module.Module.properties.Installable = proptools.BoolPtr(true)
 
 	InitJavaModule(module, android.HostSupported)
-	android.InitApexModule(module)
 	return module
 }
 
@@ -1861,7 +1858,6 @@ type ImportProperties struct {
 type Import struct {
 	android.ModuleBase
 	android.DefaultableModuleBase
-	android.ApexModuleBase
 	prebuilt android.Prebuilt
 
 	properties ImportProperties
@@ -2018,7 +2014,6 @@ func ImportFactory() android.Module {
 
 	android.InitPrebuiltModule(module, &module.properties.Jars)
 	InitJavaModule(module, android.HostAndDeviceSupported)
-	android.InitApexModule(module)
 	return module
 }
 
@@ -2034,7 +2029,6 @@ func ImportFactoryHost() android.Module {
 
 	android.InitPrebuiltModule(module, &module.properties.Jars)
 	InitJavaModule(module, android.HostSupported)
-	android.InitApexModule(module)
 	return module
 }
 
@@ -2047,7 +2041,6 @@ type DexImportProperties struct {
 type DexImport struct {
 	android.ModuleBase
 	android.DefaultableModuleBase
-	android.ApexModuleBase
 	prebuilt android.Prebuilt
 
 	properties DexImportProperties
@@ -2139,7 +2132,6 @@ func DexImportFactory() android.Module {
 
 	android.InitPrebuiltModule(module, &module.properties.Jars)
 	InitJavaModule(module, android.DeviceSupported)
-	android.InitApexModule(module)
 	return module
 }
 
@@ -2149,7 +2141,6 @@ func DexImportFactory() android.Module {
 type Defaults struct {
 	android.ModuleBase
 	android.DefaultsModuleBase
-	android.ApexModuleBase
 }
 
 // java_defaults provides a set of properties that can be inherited by other java or android modules.
@@ -2208,7 +2199,7 @@ func DefaultsFactory(props ...interface{}) android.Module {
 	)
 
 	android.InitDefaultsModule(module)
-	android.InitApexModule(module)
+
 	return module
 }