From 458a15bd8af649af4f2d3752ba2e6d0d5c61350b Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 25 Nov 2022 12:18:24 +0000 Subject: Remove IsModuleInVersionedSdk Previously, as all versioned sdk snapshots have been removed from Android.bp files this method would always return false. This change effectively replaces all calls to it with false, and then optimizes away any unused code. Bug: 260237150 Test: m nothing Change-Id: I1b717ee8345e807bd888451f6e7e3c3a0d391ee2 --- java/systemserver_classpath_fragment.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/systemserver_classpath_fragment.go') diff --git a/java/systemserver_classpath_fragment.go b/java/systemserver_classpath_fragment.go index a2cd2619a..f6cb79585 100644 --- a/java/systemserver_classpath_fragment.go +++ b/java/systemserver_classpath_fragment.go @@ -160,7 +160,7 @@ func (s *SystemServerClasspathModule) configuredJars(ctx android.ModuleContext) // This is an exception to support end-to-end test for ApexdUnitTests, until such support exists. if android.InList("test_service-apexd", possibleUpdatableModules) { jars = jars.Append("com.android.apex.test_package", "test_service-apexd") - } else if global.ApexSystemServerJars.Len() > 0 && len(unknown) > 0 && !android.IsModuleInVersionedSdk(ctx.Module()) { + } else if global.ApexSystemServerJars.Len() > 0 && len(unknown) > 0 { // For non test apexes, make sure that all contents are actually declared in make. ctx.ModuleErrorf("%s in contents must also be declared in PRODUCT_APEX_SYSTEM_SERVER_JARS", unknown) } -- cgit v1.2.3-59-g8ed1b