summaryrefslogtreecommitdiff
path: root/sdm660.mk
diff options
context:
space:
mode:
authorRyan Mitchell <rtmitchell@google.com>2019-10-10 08:09:29 -0700
committerMichael Bestas <mkbestas@lineageos.org>2020-12-20 18:55:01 +0200
commit55a4bc48a9cec3f9f7e86388f534bfa9a89413fb (patch)
treec379a02e9339b309454f02894e1bb1c6deb64aa0 /sdm660.mk
parentdd22c96b73ec7cb648662c2ef10189663ad19a58 (diff)
sdm660-common: Use component-override to configure Bluetooth
Runtime Resource Overlays (RROs) can no longer change the value of resources in manifest when read during PackagerParser. This change uses component-override to enable the service by default. Remove usages of profile_supported_* from overlays as they no longer configure the enable state of Bluetooth components. Bug: 135048762 Test: adb shell pm query-services \ com.android.bluetooth/.a2dpsink.A2dpSinkService adb shell pm query-services \ com.android.bluetooth/.avrcp.AvrcpTargetService adb shell pm query-services \ com.android.bluetooth/.avrcpcontroller.AvrcpControllerService adb shell pm query-services \ com.android.bluetooth/.ba.BATService adb shell pm query-services \ com.android.bluetooth/.hid.HidDeviceService adb shell pm query-services \ com.android.bluetooth/.sap.SapService Change-Id: I284d254a921b14d1533745611a083f4b5a27d9dc
Diffstat (limited to 'sdm660.mk')
-rw-r--r--sdm660.mk10
1 files changed, 6 insertions, 4 deletions
diff --git a/sdm660.mk b/sdm660.mk
index 4da3845..e78d4bd 100644
--- a/sdm660.mk
+++ b/sdm660.mk
@@ -28,12 +28,9 @@ PRODUCT_COMPATIBLE_PROPERTY_OVERRIDE := true
# Overlays
DEVICE_PACKAGE_OVERLAYS += \
$(LOCAL_PATH)/overlay \
- $(LOCAL_PATH)/overlay-lineage \
- $(LOCAL_PATH)/overlay-system
+ $(LOCAL_PATH)/overlay-lineage
PRODUCT_ENFORCE_RRO_TARGETS := *
-PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += \
- $(LOCAL_PATH)/overlay-system
# Soong namespaces
PRODUCT_SOONG_NAMESPACES += \
@@ -189,6 +186,11 @@ PRODUCT_PACKAGES += \
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.consumerir.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.consumerir.xml
+# Component overrides
+PRODUCT_COPY_FILES += \
+ $(LOCAL_PATH)/configs/component-overrides.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/component-overrides.xml \
+ $(LOCAL_PATH)/configs/component-overrides-qti.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/sysconfig/component-overrides.xml
+
# Display
PRODUCT_PACKAGES += \
gralloc.sdm660 \