bluetooth/audio/hal/Android.bp

@@ -1,6 +1,6 @@
 cc_binary {
     name: "android.hardware.bluetooth.audio-service-system",
-    vintf_fragment_modules: ["bluetooth_audio_system.xml"],
+    vintf_fragments: ["bluetooth_audio_system.xml"],
     init_rc: ["android.hardware.bluetooth.audio-service-system.rc"],
     relative_install_path: "hw",
     srcs: [
@@ -45,8 +45,3 @@ cc_binary {
         "android.hardware.audio@7.1-impl-system",
     ],
 }
-
-vintf_fragment {
-    name: "bluetooth_audio_system.xml",
-    src: "bluetooth_audio_system.xml",
-}

quirks/quirks.mk

@@ -2,6 +2,6 @@ LOCAL_PATH := device/peter/gsi/quirks
 
 # Keylayout quirks
 PRODUCT_COPY_FILES += \
-    $(LOCAL_PATH)/keylayout/unihertz-fingerprint_key.kl.raw:$(TARGET_COPY_OUT_SYSTEM_EXT)/quirks/keylayout/unihertz-fingerprint_key.kl \
-    $(LOCAL_PATH)/keylayout/unihertz-mtk-kpd.kl.raw:$(TARGET_COPY_OUT_SYSTEM_EXT)/quirks/keylayout/unihertz-mtk-kpd.kl \
-    $(LOCAL_PATH)/keylayout/unihertz-mtk-tpd.kl.raw:$(TARGET_COPY_OUT_SYSTEM_EXT)/quirks/keylayout/unihertz-mtk-tpd.kl \
+    $(LOCAL_PATH)/keylayout/unihertz-fingerprint_key.kl:$(TARGET_COPY_OUT_SYSTEM_EXT)/quirks/keylayout/unihertz-fingerprint_key.kl \
+    $(LOCAL_PATH)/keylayout/unihertz-mtk-kpd.kl:$(TARGET_COPY_OUT_SYSTEM_EXT)/quirks/keylayout/unihertz-mtk-kpd.kl \
+    $(LOCAL_PATH)/keylayout/unihertz-mtk-tpd.kl:$(TARGET_COPY_OUT_SYSTEM_EXT)/quirks/keylayout/unihertz-mtk-tpd.kl \