From 0194cd6610b31a48b6ddf86f71bdc4e95ab505da Mon Sep 17 00:00:00 2001 From: Ruchit Date: Sat, 2 Jul 2022 20:45:59 +0530 Subject: [PATCH] sm7125: Clean up common.mk --- common.mk | 8 -------- 1 file changed, 8 deletions(-) diff --git a/common.mk b/common.mk index ba5b27f..1e0cd3f 100644 --- a/common.mk +++ b/common.mk @@ -67,11 +67,7 @@ PRODUCT_PACKAGES += \ # Audio PRODUCT_PACKAGES += \ android.hardware.audio.service \ -<<<<<<< HEAD android.hardware.audio@6.0-impl.sm7125 \ -======= - android.hardware.audio@6.0-impl \ ->>>>>>> parent of 4929810 (Update audio HAL to v7 and disable DRC) android.hardware.audio.effect@6.0-impl \ android.hardware.soundtrigger@2.2-impl \ audio.a2dp.default \ @@ -384,11 +380,7 @@ PRODUCT_PACKAGES += \ # USB PRODUCT_PACKAGES += \ -<<<<<<< HEAD android.hardware.usb@1.3-service-qti -======= - android.hardware.usb@1.2-service-qti ->>>>>>> parent of 4929810 (Update audio HAL to v7 and disable DRC) # Vibrator PRODUCT_PACKAGES += \