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

Merge "Make CompOS library optional in PRODUCT_APEX_SYSTEM_SERVER_JARS" am: 07549129e2

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1892439

Change-Id: I372ab729757626af46e7c4d8708c1c4d07c358d8
This commit is contained in:
Treehugger Robot
2021-11-22 10:48:30 +00:00
committed by Automerger Merge Worker
parent 170652045d 07549129e2
commit 469da3abde
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. // TODO(b/203233647): Add better mechanism to make it optional.
_, unknown = android.RemoveFromList("car-frameworks-service-module", unknown) _, 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 // 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, // 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. // we should check if we are creating a config for apex_test via ApexInfo and amend the values.