This CL updates platform_systemserverclasspath, systemserverclasspath_fragment, and prebuilt_systemserverclasspath_fragment to write entries for STANDALONE_SYSTEMSERVER_JARS to systemserverclasspath.pb. A new property `standalone_contents` is aded to `systemserverclasspath_fragment` and `prebuilt_systemserverclasspath_fragment` to list the standalone system server jars in the APEX, and entries will be written to systemserverclasspath.pb accordingly at build time. To add more context, these entries will be consumed by derive_classpath in order to generate an environment variable PRODUCT_STANDALONE_SYSTEM_SERVER_JARS. The environment variable will then be comsumed by odrefresh to determine what jars to preopt on early boot. Note that the variable should not end with "CLASSPATH" because the list is not used by runtime as a classpath. It is just a colon-separated list of jars. System server loads the jars separately with paths hardcoded in the code. Bug: 203198541 Test: manual - 1. Add some jars to PRODUCT_STANDALONE_SYSTEM_SERVER_JARS 2. Add some other jars to PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS and standalone_contents. 3. Build an image. 4. Flash the image to a device. 5. adb shell echo \$STANDALONE_SYSTEMSERVER_JARS 6. See the correct list of jars. Change-Id: I09a6fd1d3db85c194330da9b751702a9bf069e26
163 lines
5.8 KiB
Go
163 lines
5.8 KiB
Go
// Copyright 2020 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 dexpreopt
|
|
|
|
import (
|
|
"fmt"
|
|
|
|
"android/soong/android"
|
|
)
|
|
|
|
type fakeToolBinary struct {
|
|
android.ModuleBase
|
|
}
|
|
|
|
func (m *fakeToolBinary) GenerateAndroidBuildActions(ctx android.ModuleContext) {}
|
|
|
|
func (m *fakeToolBinary) HostToolPath() android.OptionalPath {
|
|
return android.OptionalPathForPath(android.PathForTesting("dex2oat"))
|
|
}
|
|
|
|
func fakeToolBinaryFactory() android.Module {
|
|
module := &fakeToolBinary{}
|
|
android.InitAndroidArchModule(module, android.HostSupported, android.MultilibFirst)
|
|
return module
|
|
}
|
|
|
|
func RegisterToolModulesForTest(ctx android.RegistrationContext) {
|
|
ctx.RegisterModuleType("fake_tool_binary", fakeToolBinaryFactory)
|
|
}
|
|
|
|
func BpToolModulesForTest() string {
|
|
return `
|
|
fake_tool_binary {
|
|
name: "dex2oatd",
|
|
}
|
|
`
|
|
}
|
|
|
|
func CompatLibDefinitionsForTest() string {
|
|
bp := ""
|
|
|
|
// For class loader context and <uses-library> tests.
|
|
dexpreoptModules := []string{"android.test.runner"}
|
|
dexpreoptModules = append(dexpreoptModules, CompatUsesLibs...)
|
|
dexpreoptModules = append(dexpreoptModules, OptionalCompatUsesLibs...)
|
|
|
|
for _, extra := range dexpreoptModules {
|
|
bp += fmt.Sprintf(`
|
|
java_library {
|
|
name: "%s",
|
|
srcs: ["a.java"],
|
|
sdk_version: "none",
|
|
system_modules: "stable-core-platform-api-stubs-system-modules",
|
|
compile_dex: true,
|
|
installable: true,
|
|
}
|
|
`, extra)
|
|
}
|
|
|
|
return bp
|
|
}
|
|
|
|
var PrepareForTestWithDexpreoptCompatLibs = android.GroupFixturePreparers(
|
|
android.FixtureAddFile("defaults/dexpreopt/compat/a.java", nil),
|
|
android.FixtureAddTextFile("defaults/dexpreopt/compat/Android.bp", CompatLibDefinitionsForTest()),
|
|
)
|
|
|
|
var PrepareForTestWithFakeDex2oatd = android.GroupFixturePreparers(
|
|
android.FixtureRegisterWithContext(RegisterToolModulesForTest),
|
|
android.FixtureAddTextFile("defaults/dexpreopt/Android.bp", BpToolModulesForTest()),
|
|
)
|
|
|
|
// Prepares a test fixture by enabling dexpreopt, registering the fake_tool_binary module type and
|
|
// using that to define the `dex2oatd` module.
|
|
var PrepareForTestByEnablingDexpreopt = android.GroupFixturePreparers(
|
|
FixtureModifyGlobalConfig(func(*GlobalConfig) {}),
|
|
)
|
|
|
|
// FixtureModifyGlobalConfig enables dexpreopt (unless modified by the mutator) and modifies the
|
|
// configuration.
|
|
func FixtureModifyGlobalConfig(configModifier func(dexpreoptConfig *GlobalConfig)) android.FixturePreparer {
|
|
return android.FixtureModifyConfig(func(config android.Config) {
|
|
// Initialize the dexpreopt GlobalConfig to an empty structure. This has no effect if it has
|
|
// already been set.
|
|
pathCtx := android.PathContextForTesting(config)
|
|
dexpreoptConfig := GlobalConfigForTests(pathCtx)
|
|
SetTestGlobalConfig(config, dexpreoptConfig)
|
|
|
|
// Retrieve the existing configuration and modify it.
|
|
dexpreoptConfig = GetGlobalConfig(pathCtx)
|
|
configModifier(dexpreoptConfig)
|
|
})
|
|
}
|
|
|
|
// FixtureSetArtBootJars enables dexpreopt and sets the ArtApexJars property.
|
|
func FixtureSetArtBootJars(bootJars ...string) android.FixturePreparer {
|
|
return FixtureModifyGlobalConfig(func(dexpreoptConfig *GlobalConfig) {
|
|
dexpreoptConfig.ArtApexJars = android.CreateTestConfiguredJarList(bootJars)
|
|
})
|
|
}
|
|
|
|
// FixtureSetBootJars enables dexpreopt and sets the BootJars property.
|
|
func FixtureSetBootJars(bootJars ...string) android.FixturePreparer {
|
|
return FixtureModifyGlobalConfig(func(dexpreoptConfig *GlobalConfig) {
|
|
dexpreoptConfig.BootJars = android.CreateTestConfiguredJarList(bootJars)
|
|
})
|
|
}
|
|
|
|
// FixtureSetApexBootJars sets the ApexBootJars property in the global config.
|
|
func FixtureSetApexBootJars(bootJars ...string) android.FixturePreparer {
|
|
return FixtureModifyGlobalConfig(func(dexpreoptConfig *GlobalConfig) {
|
|
dexpreoptConfig.ApexBootJars = android.CreateTestConfiguredJarList(bootJars)
|
|
})
|
|
}
|
|
|
|
// FixtureSetStandaloneSystemServerJars sets the StandaloneSystemServerJars property.
|
|
func FixtureSetStandaloneSystemServerJars(jars ...string) android.FixturePreparer {
|
|
return FixtureModifyGlobalConfig(func(dexpreoptConfig *GlobalConfig) {
|
|
dexpreoptConfig.StandaloneSystemServerJars = android.CreateTestConfiguredJarList(jars)
|
|
})
|
|
}
|
|
|
|
// FixtureSetSystemServerJars sets the SystemServerJars property.
|
|
func FixtureSetSystemServerJars(jars ...string) android.FixturePreparer {
|
|
return FixtureModifyGlobalConfig(func(dexpreoptConfig *GlobalConfig) {
|
|
dexpreoptConfig.SystemServerJars = android.CreateTestConfiguredJarList(jars)
|
|
})
|
|
}
|
|
|
|
// FixtureSetApexSystemServerJars sets the ApexSystemServerJars property in the global config.
|
|
func FixtureSetApexSystemServerJars(jars ...string) android.FixturePreparer {
|
|
return FixtureModifyGlobalConfig(func(dexpreoptConfig *GlobalConfig) {
|
|
dexpreoptConfig.ApexSystemServerJars = android.CreateTestConfiguredJarList(jars)
|
|
})
|
|
}
|
|
|
|
// FixtureSetApexStandaloneSystemServerJars sets the ApexStandaloneSystemServerJars property in the
|
|
// global config.
|
|
func FixtureSetApexStandaloneSystemServerJars(jars ...string) android.FixturePreparer {
|
|
return FixtureModifyGlobalConfig(func(dexpreoptConfig *GlobalConfig) {
|
|
dexpreoptConfig.ApexStandaloneSystemServerJars = android.CreateTestConfiguredJarList(jars)
|
|
})
|
|
}
|
|
|
|
// FixtureSetPreoptWithUpdatableBcp sets the PreoptWithUpdatableBcp property in the global config.
|
|
func FixtureSetPreoptWithUpdatableBcp(value bool) android.FixturePreparer {
|
|
return FixtureModifyGlobalConfig(func(dexpreoptConfig *GlobalConfig) {
|
|
dexpreoptConfig.PreoptWithUpdatableBcp = value
|
|
})
|
|
}
|