cee9e19a51
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
108 lines
3.7 KiB
Go
108 lines
3.7 KiB
Go
// Copyright (C) 2021 The Android Open Source Project
|
|
//
|
|
// 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 (
|
|
"testing"
|
|
|
|
"android/soong/android"
|
|
)
|
|
|
|
var prepareForTestWithSystemServerClasspath = android.GroupFixturePreparers(
|
|
PrepareForTestWithJavaDefaultModules,
|
|
)
|
|
|
|
func TestPlatformSystemServerClasspathVariant(t *testing.T) {
|
|
result := android.GroupFixturePreparers(
|
|
prepareForTestWithSystemServerClasspath,
|
|
android.FixtureWithRootAndroidBp(`
|
|
platform_systemserverclasspath {
|
|
name: "platform-systemserverclasspath",
|
|
}
|
|
`),
|
|
).RunTest(t)
|
|
|
|
variants := result.ModuleVariantsForTests("platform-systemserverclasspath")
|
|
android.AssertIntEquals(t, "expect 1 variant", 1, len(variants))
|
|
}
|
|
|
|
func TestPlatformSystemServerClasspath_ClasspathFragmentPaths(t *testing.T) {
|
|
result := android.GroupFixturePreparers(
|
|
prepareForTestWithSystemServerClasspath,
|
|
android.FixtureWithRootAndroidBp(`
|
|
platform_systemserverclasspath {
|
|
name: "platform-systemserverclasspath",
|
|
}
|
|
`),
|
|
).RunTest(t)
|
|
|
|
p := result.Module("platform-systemserverclasspath", "android_common").(*platformSystemServerClasspathModule)
|
|
android.AssertStringEquals(t, "output filepath", "systemserverclasspath.pb", p.ClasspathFragmentBase.outputFilepath.Base())
|
|
android.AssertPathRelativeToTopEquals(t, "install filepath", "out/soong/target/product/test_device/system/etc/classpaths", p.ClasspathFragmentBase.installDirPath)
|
|
}
|
|
|
|
func TestPlatformSystemServerClasspathModule_AndroidMkEntries(t *testing.T) {
|
|
preparer := android.GroupFixturePreparers(
|
|
prepareForTestWithSystemServerClasspath,
|
|
android.FixtureWithRootAndroidBp(`
|
|
platform_systemserverclasspath {
|
|
name: "platform-systemserverclasspath",
|
|
}
|
|
`),
|
|
)
|
|
|
|
t.Run("AndroidMkEntries", func(t *testing.T) {
|
|
result := preparer.RunTest(t)
|
|
|
|
p := result.Module("platform-systemserverclasspath", "android_common").(*platformSystemServerClasspathModule)
|
|
|
|
entries := android.AndroidMkEntriesForTest(t, result.TestContext, p)
|
|
android.AssertIntEquals(t, "AndroidMkEntries count", 1, len(entries))
|
|
})
|
|
|
|
t.Run("classpath-fragment-entry", func(t *testing.T) {
|
|
result := preparer.RunTest(t)
|
|
|
|
want := map[string][]string{
|
|
"LOCAL_MODULE": {"platform-systemserverclasspath"},
|
|
"LOCAL_MODULE_CLASS": {"ETC"},
|
|
"LOCAL_INSTALLED_MODULE_STEM": {"systemserverclasspath.pb"},
|
|
// Output and Install paths are tested separately in TestPlatformSystemServerClasspath_ClasspathFragmentPaths
|
|
}
|
|
|
|
p := result.Module("platform-systemserverclasspath", "android_common").(*platformSystemServerClasspathModule)
|
|
|
|
entries := android.AndroidMkEntriesForTest(t, result.TestContext, p)
|
|
got := entries[0]
|
|
for k, expectedValue := range want {
|
|
if value, ok := got.EntryMap[k]; ok {
|
|
android.AssertDeepEquals(t, k, expectedValue, value)
|
|
} else {
|
|
t.Errorf("No %s defined, saw %q", k, got.EntryMap)
|
|
}
|
|
}
|
|
})
|
|
}
|
|
|
|
func TestSystemServerClasspathFragmentWithoutContents(t *testing.T) {
|
|
prepareForTestWithSystemServerClasspath.
|
|
ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(
|
|
`\QEither contents or standalone_contents needs to be non-empty\E`)).
|
|
RunTestWithBp(t, `
|
|
systemserverclasspath_fragment {
|
|
name: "systemserverclasspath-fragment",
|
|
}
|
|
`)
|
|
}
|