diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-07 01:01:13 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-07 01:01:13 +0000 |
| commit | 9fc98f07ace3065553db97e078ea87f22155688f (patch) | |
| tree | 9be12faf3c2796c323169d2443c51891a489387a /java/systemserver_classpath_fragment.go | |
| parent | 6954e31c4d920a15d7117a9a41b7ddabcbc0c99b (diff) | |
| parent | bb2e205603d54e6f1a0e12f806410d0ca4271afa (diff) | |
Snap for 7526818 from bb2e205603d54e6f1a0e12f806410d0ca4271afa to sc-release
Change-Id: Ia81dd935e27b007cbda13a2745ecaef499560d0f
Diffstat (limited to 'java/systemserver_classpath_fragment.go')
| -rw-r--r-- | java/systemserver_classpath_fragment.go | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/java/systemserver_classpath_fragment.go b/java/systemserver_classpath_fragment.go index 992ade522..a2006b778 100644 --- a/java/systemserver_classpath_fragment.go +++ b/java/systemserver_classpath_fragment.go @@ -98,21 +98,12 @@ func (s *SystemServerClasspathModule) GenerateAndroidBuildActions(ctx android.Mo func (s *SystemServerClasspathModule) ClasspathFragmentToConfiguredJarList(ctx android.ModuleContext) android.ConfiguredJarList { global := dexpreopt.GetGlobalConfig(ctx) - // Convert content names to their appropriate stems, in case a test library is overriding an actual boot jar - var stems []string - for _, name := range s.properties.Contents { - dep := ctx.GetDirectDepWithTag(name, systemServerClasspathFragmentContentDepTag) - if m, ok := dep.(ModuleWithStem); ok { - stems = append(stems, m.Stem()) - } else { - ctx.PropertyErrorf("contents", "%v is not a ModuleWithStem", name) - } - } + possibleUpdatableModules := gatherPossibleUpdatableModuleNamesAndStems(ctx, s.properties.Contents, systemServerClasspathFragmentContentDepTag) // Only create configs for updatable boot jars. Non-updatable system server jars must be part of the // platform_systemserverclasspath's classpath proto config to guarantee that they come before any // updatable jars at runtime. - return global.UpdatableSystemServerJars.Filter(stems) + return global.UpdatableSystemServerJars.Filter(possibleUpdatableModules) } type systemServerClasspathFragmentContentDependencyTag struct { |