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

Merge "Add exemption for framework-sdkextensions-classpaths boot jar."

Browse Source
This commit is contained in:
satayev
2021-06-08 13:45:56 +00:00
committed by Gerrit Code Review
parent 4aa0003362 1b75a3ce62
commit 5831f70dab
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/bootclasspath_fragment.go
View File

@@ -516,7 +516,16 @@ func (b *BootclasspathFragmentModule) ClasspathFragmentToConfiguredJarList(ctx a
// Only create configs for updatable boot jars. Non-updatable boot jars must be part of the // Only create configs for updatable boot jars. Non-updatable boot jars must be part of the
// platform_bootclasspath's classpath proto config to guarantee that they come before any // platform_bootclasspath's classpath proto config to guarantee that they come before any
// updatable jars at runtime. // updatable jars at runtime.
return global.UpdatableBootJars.Filter(stems) jars := global.UpdatableBootJars.Filter(stems)
// 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 UpdatableBootJars. Instead,
// we should check if we are creating a config for apex_test via ApexInfo and amend the values.
// This is an exception to support end-to-end test for SdkExtensions, until such support exists.
if android.InList("test_framework-sdkextensions", stems) {
jars = jars.Append("com.android.sdkext", "test_framework-sdkextensions")
}
return jars
} }
func (b *BootclasspathFragmentModule) getImageConfig(ctx android.EarlyModuleContext) *bootImageConfig { func (b *BootclasspathFragmentModule) getImageConfig(ctx android.EarlyModuleContext) *bootImageConfig {