From d796f6f6dcb1c34bb7ed5c699588eb3938a3ed37 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 23 Nov 2022 23:06:05 +0000 Subject: Stop module types being SdkAware Removes all usages of SdkBase and InitSdkAwareModule. Bug: 260237150 Test: m nothing Change-Id: I07db8afc805eadbeb5b23f2e1d2f51567eecfab0 --- java/sdk_library.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'java/sdk_library.go') 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) { -- cgit v1.2.3-59-g8ed1b