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/systemserver_classpath_fragment.go | 3 --- 1 file changed, 3 deletions(-) (limited to 'java/systemserver_classpath_fragment.go') diff --git a/java/systemserver_classpath_fragment.go b/java/systemserver_classpath_fragment.go index f6cb79585..17d301b70 100644 --- a/java/systemserver_classpath_fragment.go +++ b/java/systemserver_classpath_fragment.go @@ -83,7 +83,6 @@ func (p *platformSystemServerClasspathModule) standaloneConfiguredJars(ctx andro type SystemServerClasspathModule struct { android.ModuleBase android.ApexModuleBase - android.SdkBase ClasspathFragmentBase @@ -113,7 +112,6 @@ func systemServerClasspathFactory() android.Module { m := &SystemServerClasspathModule{} m.AddProperties(&m.properties) android.InitApexModule(m) - android.InitSdkAwareModule(m) initClasspathFragment(m, SYSTEMSERVERCLASSPATH) android.InitAndroidArchModule(m, android.DeviceSupported, android.MultilibCommon) return m @@ -331,7 +329,6 @@ func prebuiltSystemServerClasspathModuleFactory() android.Module { // array. android.InitPrebuiltModule(m, &[]string{"placeholder"}) android.InitApexModule(m) - android.InitSdkAwareModule(m) android.InitAndroidArchModule(m, android.DeviceSupported, android.MultilibCommon) return m } -- cgit v1.2.3-59-g8ed1b