universal8895: move audio_policy_configuration.xml to device tree

[GitHub/exynos8895/android_device_samsung_universal8895-common.git] / device-common.mk

diff --git a/device-common.mk b/device-common.mk
index c14f472ba15b181847b85973c8f79d6f262644c1..b506cfa96a0c6c5090a14ada56b28c8be2ed7407 100644 (file)
--- a/device-common.mk
+++ b/device-common.mk
@@ -44,6 +44,7 @@ PRODUCT_PACKAGES += \
     libtinycompress
 
 PRODUCT_COPY_FILES += \
+    $(LOCAL_PATH)/configs/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \
     frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \
     frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \
     frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml
@@ -173,9 +174,7 @@ PRODUCT_PACKAGES += \
 
 # Power
 PRODUCT_PACKAGES += \
-    power.universal8895 \
-    android.hardware.power@1.0-service \
-    android.hardware.power@1.0-impl
+    android.hardware.power@1.0-service.exynos
 
 # Permissions
 PRODUCT_COPY_FILES += \
@@ -288,7 +287,7 @@ PRODUCT_PROPERTY_OVERRIDES += \
 
 # Vibrator
 PRODUCT_PACKAGES += \
-    android.hardware.vibrator@1.0-service.universal8895
+    android.hardware.vibrator@1.0-service.samsung-haptic
 
 # Wifi
 PRODUCT_PACKAGES += \