StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make CompOS library optional in PRODUCT_APEX_SYSTEM_SERVER_JARS

Browse Source 
CompOS is an optional module so it may legitimately be omitted from
some products.

Bug: 199147668
Test: Builds if PRODUCT_ISOLATED_COMPILATION_ENABLED not set
Change-Id: I4e031ca6184d920b64f9c370d35b5525ecbe8a1f
This commit is contained in:
Alan Stokes
2021-11-12 15:21:43 +00:00
parent 245b1bf4dc
commit bcd567ea12
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/systemserver_classpath_fragment.go
View File

@@ -125,6 +125,12 @@ func (s *SystemServerClasspathModule) configuredJars(ctx android.ModuleContext)
// TODO(b/203233647): Add better mechanism to make it optional.
_, unknown = android.RemoveFromList("car-frameworks-service-module", unknown)
// This module is optional, so it is not present in all products.
// (See PRODUCT_ISOLATED_COMPILATION_ENABLED.)
// 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("service-compos", unknown)
// TODO(satayev): for apex_test we want to include all contents unconditionally to classpaths
// config. However, any test specific jars would not be present in ApexSystemServerJars. Instead,
// we should check if we are creating a config for apex_test via ApexInfo and amend the values.