From d64ab233e45cf4267b3aea5f29869a858a53c48b Mon Sep 17 00:00:00 2001 From: Keun young Park Date: Mon, 18 Oct 2021 08:42:23 -0700 Subject: [PATCH] Make car apex's library optional in PRODUCT_APEX_SYSTEM_SERVER_JARS - car-frameworks-service-module is added from com.android.car.framework apex which only exisits in car products. Bug: 203233647 Bug: 203201931 Test: build, bootup Change-Id: I5f13b0505c1ac4fd2fd7b6559e080c8a6fb526e0 Merged-In: I5f13b0505c1ac4fd2fd7b6559e080c8a6fb526e0 (cherry picked from commit 6e3ba9ac3bb53eb565e98d3b7fb46e85e26f19ce) --- java/systemserver_classpath_fragment.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/java/systemserver_classpath_fragment.go b/java/systemserver_classpath_fragment.go index f209f4a68..b5f52fd10 100644 --- a/java/systemserver_classpath_fragment.go +++ b/java/systemserver_classpath_fragment.go @@ -120,7 +120,10 @@ func (s *SystemServerClasspathModule) configuredJars(ctx android.ModuleContext) jars, unknown := global.ApexSystemServerJars.Filter(possibleUpdatableModules) // TODO(satayev): remove geotz ssc_fragment, since geotz is not part of SSCP anymore. _, unknown = android.RemoveFromList("geotz", unknown) - + // This module only exists in car products. + // So ignore it even if it is not in PRODUCT_APEX_SYSTEM_SERVER_JARS. + // TODO(b/203233647): Add better mechanism to make it optional. + _, unknown = android.RemoveFromList("car-frameworks-service-module", unknown) // For non test apexes, make sure that all contents are actually declared in make. if global.ApexSystemServerJars.Len() > 0 && len(unknown) > 0 && !android.IsModuleInVersionedSdk(ctx.Module()) { ctx.ModuleErrorf("%s in contents must also be declared in PRODUCT_APEX_SYSTEM_SERVER_JARS", unknown)