From d3cceec723045f2b87fc4dc8cd4e728fe98467b5 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Thu, 12 May 2022 13:25:10 +0000 Subject: [PATCH] Make first_release required (cherry picked from commit 33e939944570534d7e182a5a6687b669410583c1) Defaulting the first_release to LATEST is dangerous because it is easy to forget and any module that does not provide it will not be built for a release specific build. Adds Tiramisu for the mainline modules that were missing it and defaults it to LATEST for BundledMainlineModules as they don't need to be built for a previous release. Bug: 228807460 Test: packages/modules/common/build/mainline_modules_sdks.py Merged-In: I151773f80e37a6dd7de7b6df9cfa3f0a624d38f4 Change-Id: I151773f80e37a6dd7de7b6df9cfa3f0a624d38f4 --- build/mainline_modules_sdks.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/build/mainline_modules_sdks.py b/build/mainline_modules_sdks.py index 132c426..73b0fa9 100755 --- a/build/mainline_modules_sdks.py +++ b/build/mainline_modules_sdks.py @@ -611,11 +611,7 @@ class MainlineModule: # source was first included. So, a module that was added in build T # could potentially be used in an S release and so its SDK will need # to be made available for S builds. - # - # Defaults to the latest build, i.e. the build on which this script is run - # as the snapshot is assumed to be needed in the build containing the sdk - # source. - first_release: BuildRelease = LATEST + first_release: BuildRelease # The configuration variable, defaults to ANDROID:module_build_from_source configVar: ConfigVar = ConfigVar( @@ -660,6 +656,10 @@ class BundledMainlineModule(MainlineModule): A bundled module is always preloaded into the platform images. """ + # Defaults to the latest build, i.e. the build on which this script is run + # as bundled modules are, by definition, only needed in this build. + first_release: BuildRelease = LATEST + def is_bundled(self): return True @@ -739,6 +739,11 @@ MAINLINE_MODULES = [ # bootclasspath. ]), ), + MainlineModule( + apex="com.android.scheduling", + sdks=["scheduling-sdk"], + first_release=S, + ), MainlineModule( apex="com.android.sdkext", sdks=["sdkextensions-sdk"], @@ -773,7 +778,7 @@ MAINLINE_MODULES = [ ), ] -# List of Mainline modules that currently are never built unbundled. They should +# List of Mainline modules that currently are never built unbundled. They must # not specify first_release, and they don't have com.google.android # counterparts. BUNDLED_MAINLINE_MODULES = [