From be5c887ced0982c6ac94186a3c1f9d2a6598e78e Mon Sep 17 00:00:00 2001 From: Roopa Sattiraju Date: Thu, 3 Feb 2022 09:04:07 -0800 Subject: [PATCH] Enabling Apex in BT Bug: 217736913 Test: Compile, bringup and test user journeys Change-Id: I2371a3cfbb3770802b1a318cf0695af52dcf8cc0 --- target/product/base_system.mk | 1 + target/product/default_art_config.mk | 2 ++ target/product/handheld_system.mk | 1 - 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/target/product/base_system.mk b/target/product/base_system.mk index e025e388d7..de093a26c8 100644 --- a/target/product/base_system.mk +++ b/target/product/base_system.mk @@ -52,6 +52,7 @@ PRODUCT_PACKAGES += \ com.android.adbd \ com.android.adservices \ com.android.appsearch \ + com.android.bluetooth \ com.android.auxiliary \ com.android.conscrypt \ com.android.cronet \ diff --git a/target/product/default_art_config.mk b/target/product/default_art_config.mk index 531af33a76..9340743688 100644 --- a/target/product/default_art_config.mk +++ b/target/product/default_art_config.mk @@ -53,6 +53,7 @@ PRODUCT_BOOT_JARS += \ PRODUCT_APEX_BOOT_JARS := \ com.android.appsearch:framework-appsearch \ com.android.auxiliary:framework-auxiliary \ + com.android.bluetooth:framework-bluetooth \ com.android.conscrypt:conscrypt \ com.android.i18n:core-icu4j \ com.android.ipsec:android.net.ipsec.ike \ @@ -98,6 +99,7 @@ PRODUCT_STANDALONE_SYSTEM_SERVER_JARS := \ # Keep the list sorted by module names and then library names. # Note: For modules available in Q, DO NOT add new entries here. PRODUCT_APEX_STANDALONE_SYSTEM_SERVER_JARS := \ + com.android.bluetooth:service-bluetooth \ com.android.os.statsd:service-statsd \ com.android.scheduling:service-scheduling \ com.android.tethering:service-connectivity \ diff --git a/target/product/handheld_system.mk b/target/product/handheld_system.mk index 3a59f6c320..41233b2c0a 100644 --- a/target/product/handheld_system.mk +++ b/target/product/handheld_system.mk @@ -34,7 +34,6 @@ $(call inherit-product-if-exists, frameworks/webview/chromium/chromium.mk) PRODUCT_PACKAGES += \ BasicDreams \ BlockedNumberProvider \ - Bluetooth \ BluetoothMidiService \ BookmarkProvider \ BuiltInPrintService \