24813e1d80
Also, add tests for compatibility libraries in class loader context. This CL separates special-case handling of compatibility libraries into a "fixup" step that is done after class loader context is constructed by Soong. This allows to handle compatibility libraries and normal libraries uniformly, which should enable further simplification of class loader context representation (in subsequent CLs). Currently the only "fixup" step is removal of libraries from conditional class loader context if they already are in unconditional context. This check cannot be done at the time when the libraries are added to conditional context, because the full uncoditional context is not yet known at that time. Previously construction of unconditional context was delayed, now it is no longer delayed and handled in the same way as unconditional context, and the "fixup" does the filtering. Test: lunch aosp_cf_x86_phone-userdebug && m Bug: 132357300 Change-Id: Ie71e9fb2d3d529b5317cd84e09ab3c853017c349
225 lines
7.7 KiB
Go
225 lines
7.7 KiB
Go
// Copyright 2019 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 (
|
|
"fmt"
|
|
"reflect"
|
|
"sort"
|
|
"testing"
|
|
|
|
"android/soong/android"
|
|
"android/soong/cc"
|
|
"android/soong/dexpreopt"
|
|
"android/soong/python"
|
|
|
|
"github.com/google/blueprint"
|
|
)
|
|
|
|
func TestConfig(buildDir string, env map[string]string, bp string, fs map[string][]byte) android.Config {
|
|
bp += GatherRequiredDepsForTest()
|
|
|
|
mockFS := map[string][]byte{
|
|
"api/current.txt": nil,
|
|
"api/removed.txt": nil,
|
|
"api/system-current.txt": nil,
|
|
"api/system-removed.txt": nil,
|
|
"api/test-current.txt": nil,
|
|
"api/test-removed.txt": nil,
|
|
|
|
"prebuilts/sdk/14/public/android.jar": nil,
|
|
"prebuilts/sdk/14/public/framework.aidl": nil,
|
|
"prebuilts/sdk/14/system/android.jar": nil,
|
|
"prebuilts/sdk/17/public/android.jar": nil,
|
|
"prebuilts/sdk/17/public/framework.aidl": nil,
|
|
"prebuilts/sdk/17/system/android.jar": nil,
|
|
"prebuilts/sdk/28/public/android.jar": nil,
|
|
"prebuilts/sdk/28/public/framework.aidl": nil,
|
|
"prebuilts/sdk/28/system/android.jar": nil,
|
|
"prebuilts/sdk/29/public/android.jar": nil,
|
|
"prebuilts/sdk/29/public/framework.aidl": nil,
|
|
"prebuilts/sdk/29/system/android.jar": nil,
|
|
"prebuilts/sdk/29/system/foo.jar": nil,
|
|
"prebuilts/sdk/30/public/android.jar": nil,
|
|
"prebuilts/sdk/30/public/framework.aidl": nil,
|
|
"prebuilts/sdk/30/system/android.jar": nil,
|
|
"prebuilts/sdk/30/system/foo.jar": nil,
|
|
"prebuilts/sdk/30/module-lib/android.jar": nil,
|
|
"prebuilts/sdk/30/module-lib/foo.jar": nil,
|
|
"prebuilts/sdk/30/public/core-for-system-modules.jar": nil,
|
|
"prebuilts/sdk/current/core/android.jar": nil,
|
|
"prebuilts/sdk/current/public/android.jar": nil,
|
|
"prebuilts/sdk/current/public/framework.aidl": nil,
|
|
"prebuilts/sdk/current/public/core.jar": nil,
|
|
"prebuilts/sdk/current/public/core-for-system-modules.jar": nil,
|
|
"prebuilts/sdk/current/system/android.jar": nil,
|
|
"prebuilts/sdk/current/test/android.jar": nil,
|
|
"prebuilts/sdk/28/public/api/foo.txt": nil,
|
|
"prebuilts/sdk/28/system/api/foo.txt": nil,
|
|
"prebuilts/sdk/28/test/api/foo.txt": nil,
|
|
"prebuilts/sdk/28/public/api/foo-removed.txt": nil,
|
|
"prebuilts/sdk/28/system/api/foo-removed.txt": nil,
|
|
"prebuilts/sdk/28/test/api/foo-removed.txt": nil,
|
|
"prebuilts/sdk/28/public/api/bar.txt": nil,
|
|
"prebuilts/sdk/28/system/api/bar.txt": nil,
|
|
"prebuilts/sdk/28/test/api/bar.txt": nil,
|
|
"prebuilts/sdk/28/public/api/bar-removed.txt": nil,
|
|
"prebuilts/sdk/28/system/api/bar-removed.txt": nil,
|
|
"prebuilts/sdk/28/test/api/bar-removed.txt": nil,
|
|
"prebuilts/sdk/30/public/api/foo.txt": nil,
|
|
"prebuilts/sdk/30/system/api/foo.txt": nil,
|
|
"prebuilts/sdk/30/test/api/foo.txt": nil,
|
|
"prebuilts/sdk/30/public/api/foo-removed.txt": nil,
|
|
"prebuilts/sdk/30/system/api/foo-removed.txt": nil,
|
|
"prebuilts/sdk/30/test/api/foo-removed.txt": nil,
|
|
"prebuilts/sdk/30/public/api/bar.txt": nil,
|
|
"prebuilts/sdk/30/system/api/bar.txt": nil,
|
|
"prebuilts/sdk/30/test/api/bar.txt": nil,
|
|
"prebuilts/sdk/30/public/api/bar-removed.txt": nil,
|
|
"prebuilts/sdk/30/system/api/bar-removed.txt": nil,
|
|
"prebuilts/sdk/30/test/api/bar-removed.txt": nil,
|
|
"prebuilts/sdk/tools/core-lambda-stubs.jar": nil,
|
|
"prebuilts/sdk/Android.bp": []byte(`prebuilt_apis { name: "sdk", api_dirs: ["14", "28", "30", "current"], imports_sdk_version: "none", imports_compile_dex:true,}`),
|
|
|
|
"bin.py": nil,
|
|
python.StubTemplateHost: []byte(`PYTHON_BINARY = '%interpreter%'
|
|
MAIN_FILE = '%main%'`),
|
|
|
|
// For java_sdk_library
|
|
"api/module-lib-current.txt": nil,
|
|
"api/module-lib-removed.txt": nil,
|
|
"api/system-server-current.txt": nil,
|
|
"api/system-server-removed.txt": nil,
|
|
}
|
|
|
|
cc.GatherRequiredFilesForTest(mockFS)
|
|
|
|
for k, v := range fs {
|
|
mockFS[k] = v
|
|
}
|
|
|
|
if env == nil {
|
|
env = make(map[string]string)
|
|
}
|
|
if env["ANDROID_JAVA8_HOME"] == "" {
|
|
env["ANDROID_JAVA8_HOME"] = "jdk8"
|
|
}
|
|
config := android.TestArchConfig(buildDir, env, bp, mockFS)
|
|
|
|
return config
|
|
}
|
|
|
|
func GatherRequiredDepsForTest() string {
|
|
var bp string
|
|
|
|
extraModules := []string{
|
|
"core-lambda-stubs",
|
|
"ext",
|
|
"android_stubs_current",
|
|
"android_system_stubs_current",
|
|
"android_test_stubs_current",
|
|
"android_module_lib_stubs_current",
|
|
"android_system_server_stubs_current",
|
|
"core.current.stubs",
|
|
"legacy.core.platform.api.stubs",
|
|
"stable.core.platform.api.stubs",
|
|
"kotlin-stdlib",
|
|
"kotlin-stdlib-jdk7",
|
|
"kotlin-stdlib-jdk8",
|
|
"kotlin-annotations",
|
|
}
|
|
|
|
for _, extra := range extraModules {
|
|
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,
|
|
}
|
|
`, extra)
|
|
}
|
|
|
|
// For class loader context and <uses-library> tests.
|
|
dexpreoptModules := []string{"android.test.runner"}
|
|
dexpreoptModules = append(dexpreoptModules, dexpreopt.CompatUsesLibs...)
|
|
dexpreoptModules = append(dexpreoptModules, dexpreopt.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)
|
|
}
|
|
|
|
bp += `
|
|
java_library {
|
|
name: "framework",
|
|
srcs: ["a.java"],
|
|
sdk_version: "none",
|
|
system_modules: "stable-core-platform-api-stubs-system-modules",
|
|
aidl: {
|
|
export_include_dirs: ["framework/aidl"],
|
|
},
|
|
}
|
|
|
|
android_app {
|
|
name: "framework-res",
|
|
sdk_version: "core_platform",
|
|
}`
|
|
|
|
systemModules := []string{
|
|
"core-current-stubs-system-modules",
|
|
"legacy-core-platform-api-stubs-system-modules",
|
|
"stable-core-platform-api-stubs-system-modules",
|
|
}
|
|
|
|
for _, extra := range systemModules {
|
|
bp += fmt.Sprintf(`
|
|
java_system_modules {
|
|
name: "%[1]s",
|
|
libs: ["%[1]s-lib"],
|
|
}
|
|
java_library {
|
|
name: "%[1]s-lib",
|
|
sdk_version: "none",
|
|
system_modules: "none",
|
|
}
|
|
`, extra)
|
|
}
|
|
|
|
return bp
|
|
}
|
|
|
|
func CheckModuleDependencies(t *testing.T, ctx *android.TestContext, name, variant string, expected []string) {
|
|
t.Helper()
|
|
module := ctx.ModuleForTests(name, variant).Module()
|
|
deps := []string{}
|
|
ctx.VisitDirectDeps(module, func(m blueprint.Module) {
|
|
deps = append(deps, m.Name())
|
|
})
|
|
sort.Strings(deps)
|
|
|
|
if actual := deps; !reflect.DeepEqual(expected, actual) {
|
|
t.Errorf("expected %#q, found %#q", expected, actual)
|
|
}
|
|
}
|