aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2022-06-13 15:31:51 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-06-13 15:31:51 +0000
commit397cb9b305c60e11b2fc383789f9cfb8b4263ad7 (patch)
tree2911040b8e9069acf2cdbf068808157dd2a59424
parenta9ef7a50098da15966c9db84ca8bc1fc4b263ec5 (diff)
parent350760127fa3031d996736483862cf641fe6d06d (diff)
downloadcommon-397cb9b305c60e11b2fc383789f9cfb8b4263ad7.tar.gz
Add bluetooth and uwb as optional modules am: 350760127f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/common/+/18839975 Change-Id: I5b3a027d6a96d4b39aa2354b84abe8d3d6f56439 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rwxr-xr-xbuild/mainline_modules_sdks.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/build/mainline_modules_sdks.py b/build/mainline_modules_sdks.py
index a4dd1aca..2f4daa6f 100755
--- a/build/mainline_modules_sdks.py
+++ b/build/mainline_modules_sdks.py
@@ -771,6 +771,8 @@ MAINLINE_MODULES = [
apex="com.android.bluetooth",
sdks=["bluetooth-module-sdk"],
first_release=Tiramisu,
+ # Bluetooth has always been and is still optional.
+ last_optional_release=LATEST,
),
MainlineModule(
apex="com.android.conscrypt",
@@ -861,6 +863,8 @@ MAINLINE_MODULES = [
apex="com.android.uwb",
sdks=["uwb-module-sdk"],
first_release=Tiramisu,
+ # Uwb has always been and is still optional.
+ last_optional_release=LATEST,
),
MainlineModule(
apex="com.android.wifi",