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/bootclasspath_fragment.go | 3 --- 1 file changed, 3 deletions(-) (limited to 'java/bootclasspath_fragment.go') diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index e67f1cab1..101d3cad9 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -229,7 +229,6 @@ type SourceOnlyBootclasspathProperties struct { type BootclasspathFragmentModule struct { android.ModuleBase android.ApexModuleBase - android.SdkBase ClasspathFragmentBase // True if this fragment is for testing purposes. @@ -279,7 +278,6 @@ func bootclasspathFragmentFactory() android.Module { m := &BootclasspathFragmentModule{} m.AddProperties(&m.properties, &m.sourceOnlyProperties) android.InitApexModule(m) - android.InitSdkAwareModule(m) initClasspathFragment(m, BOOTCLASSPATH) android.InitAndroidArchModule(m, android.DeviceSupported, android.MultilibCommon) @@ -1353,7 +1351,6 @@ func prebuiltBootclasspathFragmentFactory() android.Module { // array. android.InitPrebuiltModule(m, &[]string{"placeholder"}) android.InitApexModule(m) - android.InitSdkAwareModule(m) android.InitAndroidArchModule(m, android.HostAndDeviceSupported, android.MultilibCommon) // Initialize the contents property from the image_name. -- cgit v1.2.3-59-g8ed1b