commit 71b33cca9d3a589badc714063e47a28b94df31a1
author Paul Duffin <paulduffin@google.com> Wed Jun 23 11:39:47 2021 +0100
committer Paul Duffin <paulduffin@google.com> Wed Jun 23 11:50:08 2021 +0100
tree d96d3cb06c4a84f00fe3ab942e329eb8c215295d
parent e59cad208902d28185e56cd659939d03e3ee47ec

Add commonSdkLibraryAndImportModule interface

The commonSdkLibraryAndImportModule defines the methods that a module
which embeds the commonToSdkLibraryAndImport struct need to provide.

Bug: 179354495
Test: m nothing
Change-Id: I7a469ae03ea5c19922200284da08a9ae38a46751

java/java.go

diff --git a/java/java.go b/java/java.go
index ae8adf2..71c1b33 100644
--- a/java/java.go
+++ b/java/java.go
@@ -643,7 +643,7 @@
 
 	module.addHostAndDeviceProperties()
 
-	module.initModuleAndImport(&module.ModuleBase)
+	module.initModuleAndImport(module)
 
 	android.InitApexModule(module)
 	android.InitSdkAwareModule(module)
@@ -1496,7 +1496,7 @@
 		&module.dexer.dexProperties,
 	)
 
-	module.initModuleAndImport(&module.ModuleBase)
+	module.initModuleAndImport(module)
 
 	module.dexProperties.Optimize.EnabledByDefault = false