diff --git a/init/Android.bp b/init/Android.bp
index 48a526c..3911adb 100644
--- a/init/Android.bp
+++ b/init/Android.bp
@@ -6,70 +6,70 @@
 prebuilt_etc {
     name: "init.connectivity.rc",
     src: "init.connectivity.rc",
-    sub_dir: "init/hw",
+    relative_install_path: "init/hw",
     vendor: true,
 }
 
 prebuilt_etc {
     name: "init.modem.rc",
     src: "init.modem.rc",
-    sub_dir: "init/hw",
+    relative_install_path: "init/hw",
     vendor: true,
 }
 
 prebuilt_etc {
     name: "init.mt6781.rc",
     src: "init.mt6781.rc",
-    sub_dir: "init/hw",
+    relative_install_path: "init/hw",
     vendor: true,
 }
 
 prebuilt_etc {
     name: "init.mt6781.power.rc",
     src: "init.mt6781.power.rc",
-    sub_dir: "init/hw",
+    relative_install_path: "init/hw",
     vendor: true,
 }
 
 prebuilt_etc {
     name: "init.mt6781.thermal.rc",
     src: "init.mt6781.thermal.rc",
-    sub_dir: "init/hw",
+    relative_install_path: "init/hw",
     vendor: true,
 }
 
 prebuilt_etc {
     name: "init.mt6781.usb.rc",
     src: "init.mt6781.usb.rc",
-    sub_dir: "init/hw",
+    relative_install_path: "init/hw",
     vendor: true,
 }
 
 prebuilt_etc {
     name: "init.nfc.fleur.rc",
     src: "init.nfc.fleur.rc",
-    sub_dir: "init",
+    relative_install_path: "init",
     vendor: true,
 }
 
 prebuilt_etc {
     name: "init.recovery.mt6781.rc",
     src: "init.recovery.mt6781.rc",
-    sub_dir: "init",
+    relative_install_path: "init",
     recovery: true,
 }
 
 prebuilt_etc {
     name: "init.project.rc",
     src: "init.project.rc",
-    sub_dir: "init/hw",
+    relative_install_path: "init/hw",
     vendor: true,
 }
 
 prebuilt_etc {
     name: "init.sensor_1_0.rc",
     src: "init.sensor_1_0.rc",
-    sub_dir: "init/hw",
+    relative_install_path: "init/hw",
     vendor: true,
 }
 
diff --git a/libshims/Android.bp b/libshims/Android.bp
index 3323428..19a625f 100644
--- a/libshims/Android.bp
+++ b/libshims/Android.bp
@@ -7,14 +7,14 @@
 cc_library_shared {
     name: "libshim_sensors",
     whole_static_libs: [
-        "android.hardware.sensors@1.0-convert"
+        "android.hardware.sensors@1.0-convert",
     ],
     shared_libs: [
         "libhardware",
         "libhidlbase",
-        "android.hardware.sensors@1.0"
+        "android.hardware.sensors@1.0",
     ],
-    vendor: true
+    vendor: true,
 }
 
 cc_library_shared {
@@ -22,5 +22,5 @@ cc_library_shared {
     srcs: [
         "libshim_power.c",
     ],
-    vendor: true
+    vendor: true,
 }
diff --git a/overlays/FrameworkOverlayFleur/Android.bp b/overlays/FrameworkOverlayFleur/Android.bp
index 0f9d52f..6adf724 100644
--- a/overlays/FrameworkOverlayFleur/Android.bp
+++ b/overlays/FrameworkOverlayFleur/Android.bp
@@ -6,6 +6,6 @@
 
 runtime_resource_overlay {
     name: "FrameworkOverlayFleur",
-    resource_dirs: ["res"],
+
     vendor: true,
 }
diff --git a/overlays/SettingsOverlayFleur/Android.bp b/overlays/SettingsOverlayFleur/Android.bp
index 9679660..b0bc700 100644
--- a/overlays/SettingsOverlayFleur/Android.bp
+++ b/overlays/SettingsOverlayFleur/Android.bp
@@ -6,6 +6,6 @@
 
 runtime_resource_overlay {
     name: "SettingsOverlayFleur",
-    resource_dirs: ["res"],
+
     vendor: true,
 }
diff --git a/overlays/SystemUIOverlayFleur/Android.bp b/overlays/SystemUIOverlayFleur/Android.bp
index 22b9ab4..a3c06ae 100644
--- a/overlays/SystemUIOverlayFleur/Android.bp
+++ b/overlays/SystemUIOverlayFleur/Android.bp
@@ -6,6 +6,6 @@
 
 runtime_resource_overlay {
     name: "SystemUIOverlayFleur",
-    resource_dirs: ["res"],
+
     vendor: true,
 }
diff --git a/overlays/TelephonyOverlayFleur/Android.bp b/overlays/TelephonyOverlayFleur/Android.bp
index 4b2ba9e..8080dcb 100644
--- a/overlays/TelephonyOverlayFleur/Android.bp
+++ b/overlays/TelephonyOverlayFleur/Android.bp
@@ -6,6 +6,6 @@
 
 runtime_resource_overlay {
     name: "TelephonyOverlayFleur",
-    resource_dirs: ["res"],
+
     product_specific: true,
 }
diff --git a/overlays/TetheringOverlay/Android.bp b/overlays/TetheringOverlay/Android.bp
index ef2cbe1..7a0a300 100644
--- a/overlays/TetheringOverlay/Android.bp
+++ b/overlays/TetheringOverlay/Android.bp
@@ -6,6 +6,6 @@
 
 runtime_resource_overlay {
     name: "TetheringConfigOverlay",
-    resource_dirs: ["res"],
+
     product_specific: true,
 }
diff --git a/overlays/WifiOverlay/Android.bp b/overlays/WifiOverlay/Android.bp
index d1b129a..2ac40f9 100644
--- a/overlays/WifiOverlay/Android.bp
+++ b/overlays/WifiOverlay/Android.bp
@@ -8,5 +8,5 @@ runtime_resource_overlay {
     name: "WifiOverlay",
     theme: "WifiOverlay",
     certificate: "platform",
-    product_specific: true
+    product_specific: true,
 }
diff --git a/vibrator/Android.bp b/vibrator/Android.bp
index dc26ed9..4a20d24 100644
--- a/vibrator/Android.bp
+++ b/vibrator/Android.bp
@@ -16,7 +16,7 @@ cc_library_shared {
         "libbinder_ndk",
         "android.hardware.vibrator-V1-ndk",
     ],
-    export_include_dirs: ["include"]
+    export_include_dirs: ["include"],
 }
 
 cc_binary {