diff options
| author | 2022-07-01 15:56:06 +0000 | |
|---|---|---|
| committer | 2022-07-05 15:13:09 +0000 | |
| commit | f861df79071da021f9089ac85c6ecb5b64ea2ffc (patch) | |
| tree | 93ac82e45bef2382492bead06adc8bd498a34e47 /java | |
| parent | e3cf1abefc7a46183c336bbe9786e74b76a7f77a (diff) | |
Stop exporting systemserverclasspath_fragment when targeting S
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
Diffstat (limited to 'java')
| -rw-r--r-- | java/java.go | 3 | ||||
| -rw-r--r-- | java/systemserver_classpath_fragment.go | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index 2897fd7f5..cbdc2bd28 100644 --- a/java/java.go +++ b/java/java.go @@ -164,6 +164,9 @@ var ( android.SdkMemberTypeBase{ PropertyName: "java_systemserver_libs", SupportsSdk: true, + + // This was only added in Tiramisu. + SupportedBuildReleaseSpecification: "Tiramisu+", }, func(ctx android.SdkMemberContext, j *Library) android.Path { // Java systemserver libs are only provided in the SDK to provide access to their dex diff --git a/java/systemserver_classpath_fragment.go b/java/systemserver_classpath_fragment.go index fa61ea68c..79d2ee9f7 100644 --- a/java/systemserver_classpath_fragment.go +++ b/java/systemserver_classpath_fragment.go @@ -28,6 +28,9 @@ func init() { SdkMemberTypeBase: android.SdkMemberTypeBase{ PropertyName: "systemserverclasspath_fragments", SupportsSdk: true, + + // This was only added in Tiramisu. + SupportedBuildReleaseSpecification: "Tiramisu+", }, }) } |