diff options
| author | 2021-11-22 10:31:59 +0000 | |
|---|---|---|
| committer | 2021-11-22 10:31:59 +0000 | |
| commit | 07549129e2bf323ddadee97515dff51c346efc08 (patch) | |
| tree | 9f1dd2a9cbdf9a8aee667a683269805cbfb8053c /java/systemserver_classpath_fragment.go | |
| parent | ec014011eada8f2a8b2af8226e16b499b1e72114 (diff) | |
| parent | bcd567ea12d826e304ca5725964e12141aae1e91 (diff) | |
Merge "Make CompOS library optional in PRODUCT_APEX_SYSTEM_SERVER_JARS"
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. |