diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-01-07 14:46:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-01-07 14:46:22 +0000 |
| commit | 4520481c6ae83196ad08a3175485356a2a3a3531 (patch) | |
| tree | a1a5a1d4a344711e10e2905a876d0133aa034d2e /java/java.go | |
| parent | 3c867b6ce861bf223979e22bb50f985d4b29e771 (diff) | |
| parent | d796f6f6dcb1c34bb7ed5c699588eb3938a3ed37 (diff) | |
Merge changes I07db8afc,Ia89e0239
* changes:
Stop module types being SdkAware
Replace usages of SdkAware in sdk module with Module
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/java/java.go b/java/java.go index 927a8d804..3b0ad8d9f 100644 --- a/java/java.go +++ b/java/java.go @@ -876,7 +876,6 @@ func LibraryFactory() android.Module { module.initModuleAndImport(module) android.InitApexModule(module) - android.InitSdkAwareModule(module) android.InitBazelModule(module) InitJavaModule(module, android.HostAndDeviceSupported) return module @@ -899,7 +898,6 @@ func LibraryHostFactory() android.Module { module.Module.properties.Installable = proptools.BoolPtr(true) android.InitApexModule(module) - android.InitSdkAwareModule(module) android.InitBazelModule(module) InitJavaModule(module, android.HostSupported) return module @@ -1340,7 +1338,6 @@ func TestFactory() android.Module { module.Module.dexpreopter.isTest = true module.Module.linter.properties.Lint.Test = proptools.BoolPtr(true) - android.InitSdkAwareModule(module) InitJavaModule(module, android.HostAndDeviceSupported) return module } @@ -1379,7 +1376,6 @@ func JavaTestImportFactory() android.Module { android.InitPrebuiltModule(module, &module.properties.Jars) android.InitApexModule(module) - android.InitSdkAwareModule(module) InitJavaModule(module, android.HostAndDeviceSupported) return module } @@ -1802,7 +1798,6 @@ type Import struct { android.ApexModuleBase android.BazelModuleBase prebuilt android.Prebuilt - android.SdkBase // Functionality common to Module and Import. embeddableInModuleAndImport @@ -2176,7 +2171,6 @@ func ImportFactory() android.Module { android.InitPrebuiltModule(module, &module.properties.Jars) android.InitApexModule(module) - android.InitSdkAwareModule(module) android.InitBazelModule(module) InitJavaModule(module, android.HostAndDeviceSupported) return module |