summaryrefslogtreecommitdiff
path: root/java/java.go
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2021-06-23 11:39:47 +0100
committerPaul Duffin <paulduffin@google.com>2021-06-23 17:46:50 +0100
commit3accbb5446e72174646ec76fa8d744f6fdc31af5 (patch)
treebe8369eb8ac8e11a111eec401ce0368bd9cce1af /java/java.go
parent0e7bb0e80adae397c96941465279fb83061b1f43 (diff)
Add commonSdkLibraryAndImportModule interface
The commonSdkLibraryAndImportModule defines the methods that a module which embeds the commonToSdkLibraryAndImport struct need to provide. Bug: 179354495 Test: m nothing Merged-In: I7a469ae03ea5c19922200284da08a9ae38a46751 Change-Id: I7a469ae03ea5c19922200284da08a9ae38a46751 (cherry picked from commit 71b33cca9d3a589badc714063e47a28b94df31a1)
Diffstat (limited to 'java/java.go')
-rw-r--r--java/java.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go
index ae8adf277..71c1b3324 100644
--- a/java/java.go
+++ b/java/java.go
@@ -643,7 +643,7 @@ func LibraryFactory() android.Module {
module.addHostAndDeviceProperties()
- module.initModuleAndImport(&module.ModuleBase)
+ module.initModuleAndImport(module)
android.InitApexModule(module)
android.InitSdkAwareModule(module)
@@ -1496,7 +1496,7 @@ func ImportFactory() android.Module {
&module.dexer.dexProperties,
)
- module.initModuleAndImport(&module.ModuleBase)
+ module.initModuleAndImport(module)
module.dexProperties.Optimize.EnabledByDefault = false