summaryrefslogtreecommitdiff
path: root/java/sdk_library.go
diff options
context:
space:
mode:
author Paul Duffin <paulduffin@google.com> 2022-11-23 23:06:05 +0000
committer Paul Duffin <paulduffin@google.com> 2022-12-12 17:33:06 +0000
commitd796f6f6dcb1c34bb7ed5c699588eb3938a3ed37 (patch)
tree37b5efac5f630c265f9ea8b458f540f4ff5ab8ee /java/sdk_library.go
parent5e71e68a82bf00b8d1ddb3c6d50a0aa38458530c (diff)
Stop module types being SdkAware
Removes all usages of SdkBase and InitSdkAwareModule. Bug: 260237150 Test: m nothing Change-Id: I07db8afc805eadbeb5b23f2e1d2f51567eecfab0
Diffstat (limited to 'java/sdk_library.go')
-rw-r--r--java/sdk_library.go5
1 files changed, 1 insertions, 4 deletions
diff --git a/java/sdk_library.go b/java/sdk_library.go
index 012309d4a..3b64bf733 100644
--- a/java/sdk_library.go
+++ b/java/sdk_library.go
@@ -752,7 +752,7 @@ type commonToSdkLibraryAndImportProperties struct {
// commonSdkLibraryAndImportModule defines the interface that must be provided by a module that
// embeds the commonToSdkLibraryAndImport struct.
type commonSdkLibraryAndImportModule interface {
- android.SdkAware
+ android.Module
BaseModuleName() string
}
@@ -2048,7 +2048,6 @@ func SdkLibraryFactory() android.Module {
module.InitSdkLibraryProperties()
android.InitApexModule(module)
- android.InitSdkAwareModule(module)
InitJavaModule(module, android.HostAndDeviceSupported)
// Initialize the map from scope to scope specific properties.
@@ -2126,7 +2125,6 @@ type SdkLibraryImport struct {
android.DefaultableModuleBase
prebuilt android.Prebuilt
android.ApexModuleBase
- android.SdkBase
hiddenAPI
dexpreopter
@@ -2208,7 +2206,6 @@ func sdkLibraryImportFactory() android.Module {
android.InitPrebuiltModule(module, &[]string{""})
android.InitApexModule(module)
- android.InitSdkAwareModule(module)
InitJavaModule(module, android.HostAndDeviceSupported)
module.SetDefaultableHook(func(mctx android.DefaultableHookContext) {