f861df7907
Previously, when targeting the S release the generated sdk snapshot would contain prebuilt_systemserverclasspath_fragment modules even though they were only added in T. This allows SdkMemberTypes to specify the set of target build releases they support and ignores them when targeting an unsupported target build release. Test: m nothing packages/modules/common/build/mainline_modules_sdks.sh # Check that the for-S-build snapshots do not include SSCPFs. Bug: 237718221 Change-Id: I2df08c2fcebf9b866695d691572a9d3783758b17
155 lines
4.4 KiB
Go
155 lines
4.4 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 sdk
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"android/soong/android"
|
|
"android/soong/dexpreopt"
|
|
"android/soong/java"
|
|
)
|
|
|
|
func testSnapshotWithSystemServerClasspathFragment(t *testing.T, targetBuildRelease string, expectedSdkSnapshot string) {
|
|
result := android.GroupFixturePreparers(
|
|
prepareForSdkTestWithJava,
|
|
java.PrepareForTestWithJavaDefaultModules,
|
|
java.PrepareForTestWithJavaSdkLibraryFiles,
|
|
java.FixtureWithLastReleaseApis("mysdklibrary"),
|
|
dexpreopt.FixtureSetApexSystemServerJars("myapex:mylib", "myapex:mysdklibrary"),
|
|
android.FixtureModifyEnv(func(env map[string]string) {
|
|
env["SOONG_SDK_SNAPSHOT_TARGET_BUILD_RELEASE"] = targetBuildRelease
|
|
}),
|
|
prepareForSdkTestWithApex,
|
|
|
|
android.FixtureWithRootAndroidBp(`
|
|
sdk {
|
|
name: "mysdk",
|
|
systemserverclasspath_fragments: ["mysystemserverclasspathfragment"],
|
|
java_sdk_libs: [
|
|
// This is not strictly needed as it should be automatically added to the sdk_snapshot as
|
|
// a java_sdk_libs module because it is used in the mysystemserverclasspathfragment's
|
|
// contents property. However, it is specified here to ensure that duplicates are
|
|
// correctly deduped.
|
|
"mysdklibrary",
|
|
],
|
|
}
|
|
|
|
apex {
|
|
name: "myapex",
|
|
key: "myapex.key",
|
|
min_sdk_version: "2",
|
|
systemserverclasspath_fragments: ["mysystemserverclasspathfragment"],
|
|
}
|
|
|
|
systemserverclasspath_fragment {
|
|
name: "mysystemserverclasspathfragment",
|
|
apex_available: ["myapex"],
|
|
contents: [
|
|
"mylib",
|
|
"mysdklibrary",
|
|
],
|
|
}
|
|
|
|
java_library {
|
|
name: "mylib",
|
|
apex_available: ["myapex"],
|
|
srcs: ["Test.java"],
|
|
system_modules: "none",
|
|
sdk_version: "none",
|
|
min_sdk_version: "2",
|
|
compile_dex: true,
|
|
permitted_packages: ["mylib"],
|
|
}
|
|
|
|
java_sdk_library {
|
|
name: "mysdklibrary",
|
|
apex_available: ["myapex"],
|
|
srcs: ["Test.java"],
|
|
shared_library: false,
|
|
public: {enabled: true},
|
|
min_sdk_version: "2",
|
|
}
|
|
`),
|
|
).RunTest(t)
|
|
|
|
CheckSnapshot(t, result, "mysdk", "",
|
|
checkAndroidBpContents(expectedSdkSnapshot),
|
|
)
|
|
}
|
|
|
|
func TestSnapshotWithSystemServerClasspathFragment(t *testing.T) {
|
|
t.Run("target-s", func(t *testing.T) {
|
|
testSnapshotWithSystemServerClasspathFragment(t, "S", `
|
|
// This is auto-generated. DO NOT EDIT.
|
|
|
|
java_sdk_library_import {
|
|
name: "mysdklibrary",
|
|
prefer: false,
|
|
visibility: ["//visibility:public"],
|
|
apex_available: ["myapex"],
|
|
shared_library: false,
|
|
public: {
|
|
jars: ["sdk_library/public/mysdklibrary-stubs.jar"],
|
|
stub_srcs: ["sdk_library/public/mysdklibrary_stub_sources"],
|
|
current_api: "sdk_library/public/mysdklibrary.txt",
|
|
removed_api: "sdk_library/public/mysdklibrary-removed.txt",
|
|
sdk_version: "current",
|
|
},
|
|
}
|
|
`)
|
|
})
|
|
|
|
t.Run("target-t", func(t *testing.T) {
|
|
testSnapshotWithSystemServerClasspathFragment(t, "Tiramisu", `
|
|
// This is auto-generated. DO NOT EDIT.
|
|
|
|
java_sdk_library_import {
|
|
name: "mysdklibrary",
|
|
prefer: false,
|
|
visibility: ["//visibility:public"],
|
|
apex_available: ["myapex"],
|
|
shared_library: false,
|
|
public: {
|
|
jars: ["sdk_library/public/mysdklibrary-stubs.jar"],
|
|
stub_srcs: ["sdk_library/public/mysdklibrary_stub_sources"],
|
|
current_api: "sdk_library/public/mysdklibrary.txt",
|
|
removed_api: "sdk_library/public/mysdklibrary-removed.txt",
|
|
sdk_version: "current",
|
|
},
|
|
}
|
|
|
|
java_import {
|
|
name: "mylib",
|
|
prefer: false,
|
|
visibility: ["//visibility:public"],
|
|
apex_available: ["myapex"],
|
|
jars: ["java_systemserver_libs/snapshot/jars/are/invalid/mylib.jar"],
|
|
permitted_packages: ["mylib"],
|
|
}
|
|
|
|
prebuilt_systemserverclasspath_fragment {
|
|
name: "mysystemserverclasspathfragment",
|
|
prefer: false,
|
|
visibility: ["//visibility:public"],
|
|
apex_available: ["myapex"],
|
|
contents: [
|
|
"mylib",
|
|
"mysdklibrary",
|
|
],
|
|
}
|
|
`)
|
|
})
|
|
}
|