Append platform classpath proto configs with missing apex jars.
Any apex classpath fragment that doesn't generate its own classpaths proto, must still propagate it's boot jars for the platform classpath fragment to include for complete CLASSPATH variables on device. Bug: 191127295 Test: atest CtsClasspathsTestCases derive_classpath_test Change-Id: I93687f69006741fcd66eb6e04891a4b4bbcc3b47
This commit is contained in:
@@ -48,13 +48,14 @@ func (p *platformSystemServerClasspathModule) AndroidMkEntries() (entries []andr
|
||||
}
|
||||
|
||||
func (p *platformSystemServerClasspathModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
||||
classpathJars := configuredJarListToClasspathJars(ctx, p.configuredJars(ctx), p.classpathType)
|
||||
p.classpathFragmentBase().generateClasspathProtoBuildActions(ctx, classpathJars)
|
||||
configuredJars := p.configuredJars(ctx)
|
||||
classpathJars := configuredJarListToClasspathJars(ctx, configuredJars, p.classpathType)
|
||||
p.classpathFragmentBase().generateClasspathProtoBuildActions(ctx, configuredJars, classpathJars)
|
||||
}
|
||||
|
||||
func (p *platformSystemServerClasspathModule) configuredJars(ctx android.ModuleContext) android.ConfiguredJarList {
|
||||
global := dexpreopt.GetGlobalConfig(ctx)
|
||||
return global.SystemServerJars
|
||||
// TODO(satayev): include any apex jars that don't populate their classpath proto config.
|
||||
return dexpreopt.GetGlobalConfig(ctx).SystemServerJars
|
||||
}
|
||||
|
||||
type SystemServerClasspathModule struct {
|
||||
@@ -94,8 +95,9 @@ func (s *SystemServerClasspathModule) GenerateAndroidBuildActions(ctx android.Mo
|
||||
ctx.PropertyErrorf("contents", "empty contents are not allowed")
|
||||
}
|
||||
|
||||
classpathJars := configuredJarListToClasspathJars(ctx, s.configuredJars(ctx), s.classpathType)
|
||||
s.classpathFragmentBase().generateClasspathProtoBuildActions(ctx, classpathJars)
|
||||
configuredJars := s.configuredJars(ctx)
|
||||
classpathJars := configuredJarListToClasspathJars(ctx, configuredJars, s.classpathType)
|
||||
s.classpathFragmentBase().generateClasspathProtoBuildActions(ctx, configuredJars, classpathJars)
|
||||
|
||||
// Collect the module directory for IDE info in java/jdeps.go.
|
||||
s.modulePaths = append(s.modulePaths, ctx.ModuleDir())
|
||||
|
Reference in New Issue
Block a user