diff options
| author | 2021-11-12 15:21:43 +0000 | |
|---|---|---|
| committer | 2021-11-17 15:37:14 +0000 | |
| commit | bcd567ea12d826e304ca5725964e12141aae1e91 (patch) | |
| tree | a55aecac7130f6a18ae6b7e6945fc5ffa86c806c /java/systemserver_classpath_fragment.go | |
| parent | 245b1bf4dcb7bd5035e7fd53fb683523d2339395 (diff) | |
Make CompOS library optional in PRODUCT_APEX_SYSTEM_SERVER_JARS
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
Diffstat (limited to 'java/systemserver_classpath_fragment.go')
| -rw-r--r-- | java/systemserver_classpath_fragment.go | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/java/systemserver_classpath_fragment.go b/java/systemserver_classpath_fragment.go index d75635c43..e263cc44c 100644 --- a/java/systemserver_classpath_fragment.go +++ b/java/systemserver_classpath_fragment.go @@ -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. |