25322e4d98
When TARGET_BUILD_APPS is set then TARGET_BUILD_USE_PREBUILT_SDKS=true which causes all java_sdk_library_import modules to be treated as prefer:true. That breaks the build when the systemserverclasspath_fragment's content property references a source java_sdk_library module that has a corresponding java_sdk_library_import prebuilt module. This fixes the issue by marking the dependency from the systemserverclasspath_fragment to the source module as one that must not be replaced with a reference to the prebuilt module. Test: - update art prebuilts to include service-art m TARGET_BUILD_APPS=Calendar apps_only - fails before, works afterwards Bug: 199116972 Change-Id: Ia2d8ce7bb7e644336a42c901f7fb8ea50fd67909
157 lines
5.9 KiB
Go
157 lines
5.9 KiB
Go
// Copyright 2021 Google Inc. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package java
|
|
|
|
import (
|
|
"android/soong/android"
|
|
"android/soong/dexpreopt"
|
|
|
|
"github.com/google/blueprint"
|
|
)
|
|
|
|
func init() {
|
|
registerSystemserverClasspathBuildComponents(android.InitRegistrationContext)
|
|
}
|
|
|
|
func registerSystemserverClasspathBuildComponents(ctx android.RegistrationContext) {
|
|
ctx.RegisterModuleType("platform_systemserverclasspath", platformSystemServerClasspathFactory)
|
|
ctx.RegisterModuleType("systemserverclasspath_fragment", systemServerClasspathFactory)
|
|
}
|
|
|
|
type platformSystemServerClasspathModule struct {
|
|
android.ModuleBase
|
|
|
|
ClasspathFragmentBase
|
|
}
|
|
|
|
func platformSystemServerClasspathFactory() android.Module {
|
|
m := &platformSystemServerClasspathModule{}
|
|
initClasspathFragment(m, SYSTEMSERVERCLASSPATH)
|
|
android.InitAndroidArchModule(m, android.DeviceSupported, android.MultilibCommon)
|
|
return m
|
|
}
|
|
|
|
func (p *platformSystemServerClasspathModule) AndroidMkEntries() (entries []android.AndroidMkEntries) {
|
|
return p.classpathFragmentBase().androidMkEntries()
|
|
}
|
|
|
|
func (p *platformSystemServerClasspathModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
|
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 {
|
|
// TODO(satayev): include any apex jars that don't populate their classpath proto config.
|
|
return dexpreopt.GetGlobalConfig(ctx).SystemServerJars
|
|
}
|
|
|
|
type SystemServerClasspathModule struct {
|
|
android.ModuleBase
|
|
android.ApexModuleBase
|
|
|
|
ClasspathFragmentBase
|
|
|
|
properties systemServerClasspathFragmentProperties
|
|
|
|
// Collect the module directory for IDE info in java/jdeps.go.
|
|
modulePaths []string
|
|
}
|
|
|
|
func (s *SystemServerClasspathModule) ShouldSupportSdkVersion(ctx android.BaseModuleContext, sdkVersion android.ApiLevel) error {
|
|
return nil
|
|
}
|
|
|
|
type systemServerClasspathFragmentProperties struct {
|
|
// The contents of this systemserverclasspath_fragment, could be either java_library, or java_sdk_library.
|
|
//
|
|
// The order of this list matters as it is the order that is used in the SYSTEMSERVERCLASSPATH.
|
|
Contents []string
|
|
}
|
|
|
|
func systemServerClasspathFactory() android.Module {
|
|
m := &SystemServerClasspathModule{}
|
|
m.AddProperties(&m.properties)
|
|
android.InitApexModule(m)
|
|
initClasspathFragment(m, SYSTEMSERVERCLASSPATH)
|
|
android.InitAndroidArchModule(m, android.DeviceSupported, android.MultilibCommon)
|
|
return m
|
|
}
|
|
|
|
func (s *SystemServerClasspathModule) GenerateAndroidBuildActions(ctx android.ModuleContext) {
|
|
if len(s.properties.Contents) == 0 {
|
|
ctx.PropertyErrorf("contents", "empty contents are not allowed")
|
|
}
|
|
|
|
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())
|
|
}
|
|
|
|
func (s *SystemServerClasspathModule) configuredJars(ctx android.ModuleContext) android.ConfiguredJarList {
|
|
global := dexpreopt.GetGlobalConfig(ctx)
|
|
|
|
possibleUpdatableModules := gatherPossibleApexModuleNamesAndStems(ctx, s.properties.Contents, systemServerClasspathFragmentContentDepTag)
|
|
jars, unknown := global.ApexSystemServerJars.Filter(possibleUpdatableModules)
|
|
// TODO(satayev): remove geotz ssc_fragment, since geotz is not part of SSCP anymore.
|
|
_, unknown = android.RemoveFromList("geotz", unknown)
|
|
|
|
// For non test apexes, make sure that all contents are actually declared in make.
|
|
if global.ApexSystemServerJars.Len() > 0 && len(unknown) > 0 {
|
|
ctx.ModuleErrorf("%s in contents must also be declared in PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS", unknown)
|
|
}
|
|
|
|
return jars
|
|
}
|
|
|
|
type systemServerClasspathFragmentContentDependencyTag struct {
|
|
blueprint.BaseDependencyTag
|
|
}
|
|
|
|
// The systemserverclasspath_fragment contents must never depend on prebuilts.
|
|
func (systemServerClasspathFragmentContentDependencyTag) ReplaceSourceWithPrebuilt() bool {
|
|
return false
|
|
}
|
|
|
|
// Contents of system server fragments in an apex are considered to be directly in the apex, as if
|
|
// they were listed in java_libs.
|
|
func (systemServerClasspathFragmentContentDependencyTag) CopyDirectlyInAnyApex() {}
|
|
|
|
var _ android.ReplaceSourceWithPrebuilt = systemServerClasspathFragmentContentDepTag
|
|
var _ android.CopyDirectlyInAnyApexTag = systemServerClasspathFragmentContentDepTag
|
|
|
|
// The tag used for the dependency between the systemserverclasspath_fragment module and its contents.
|
|
var systemServerClasspathFragmentContentDepTag = systemServerClasspathFragmentContentDependencyTag{}
|
|
|
|
func IsSystemServerClasspathFragmentContentDepTag(tag blueprint.DependencyTag) bool {
|
|
return tag == systemServerClasspathFragmentContentDepTag
|
|
}
|
|
|
|
func (s *SystemServerClasspathModule) ComponentDepsMutator(ctx android.BottomUpMutatorContext) {
|
|
module := ctx.Module()
|
|
|
|
for _, name := range s.properties.Contents {
|
|
ctx.AddDependency(module, systemServerClasspathFragmentContentDepTag, name)
|
|
}
|
|
}
|
|
|
|
// Collect information for opening IDE project files in java/jdeps.go.
|
|
func (s *SystemServerClasspathModule) IDEInfo(dpInfo *android.IdeInfo) {
|
|
dpInfo.Deps = append(dpInfo.Deps, s.properties.Contents...)
|
|
dpInfo.Paths = append(dpInfo.Paths, s.modulePaths...)
|
|
}
|