Add bluetooth and uwb as optional modules

Bug: 233965247
Test: packages/modules/common/build/mainline_modules_sdks.sh
      # Check the output to ensure that uwb/bluetooth uses the
      # module specific  Soong config.
      # Unpack the bluetooth/uwb snapshots into prebuilts/module_sdk/...
      m nothing
Ignore-AOSP-First: Bluetooth and uwb are not present in AOSP
Change-Id: I09c7b2ef95f941e61eba933b4e9b3625c01adfeb
This commit is contained in:
Paul Duffin
2022-06-09 21:26:56 +00:00
parent e75e7c57e7
commit 350760127f

View File

@@ -771,6 +771,8 @@ MAINLINE_MODULES = [
apex="com.android.bluetooth", apex="com.android.bluetooth",
sdks=["bluetooth-module-sdk"], sdks=["bluetooth-module-sdk"],
first_release=Tiramisu, first_release=Tiramisu,
# Bluetooth has always been and is still optional.
last_optional_release=LATEST,
), ),
MainlineModule( MainlineModule(
apex="com.android.conscrypt", apex="com.android.conscrypt",
@@ -861,6 +863,8 @@ MAINLINE_MODULES = [
apex="com.android.uwb", apex="com.android.uwb",
sdks=["uwb-module-sdk"], sdks=["uwb-module-sdk"],
first_release=Tiramisu, first_release=Tiramisu,
# Uwb has always been and is still optional.
last_optional_release=LATEST,
), ),
MainlineModule( MainlineModule(
apex="com.android.wifi", apex="com.android.wifi",