diff --git a/Android.bp b/Android.bp
index aa17837..e69df8d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -1,3 +1,6 @@
 soong_namespace {
-    imports: ["hardware/google/interfaces", "hardware/google/pixel"]
+    imports: [
+        "hardware/google/interfaces",
+        "hardware/google/pixel",
+    ],
 }
diff --git a/BesLoudness/Android.bp b/BesLoudness/Android.bp
index 5806a18..51263c8 100644
--- a/BesLoudness/Android.bp
+++ b/BesLoudness/Android.bp
@@ -3,7 +3,6 @@ android_app {
     defaults: ["SettingsLibDefaults"],
 
     srcs: ["src/**/*.java"],
-    resource_dirs: ["res"],
 
     certificate: "platform",
     platform_apis: true,
diff --git a/InCallService/Android.bp b/InCallService/Android.bp
index 85529c0..8fb3e83 100644
--- a/InCallService/Android.bp
+++ b/InCallService/Android.bp
@@ -8,7 +8,6 @@ android_app {
     name: "MtkInCallService",
 
     srcs: ["src/**/*.java"],
-    resource_dirs: ["res"],
 
     certificate: "platform",
     platform_apis: true,
@@ -16,5 +15,5 @@ android_app {
 
     optimize: {
         enabled: false,
-    }
+    },
 }
diff --git a/PowerOffAlarm/Android.bp b/PowerOffAlarm/Android.bp
index 46b4d19..ffb9fb2 100644
--- a/PowerOffAlarm/Android.bp
+++ b/PowerOffAlarm/Android.bp
@@ -7,7 +7,6 @@ android_app {
     name: "PowerOffAlarm",
 
     srcs: ["java/**/*.java"],
-    resource_dirs: ["res"],
 
     system_ext_specific: true,
     certificate: "platform",
@@ -50,7 +49,7 @@ cc_library {
 prebuilt_etc {
     name: "com.qualcomm.qti.poweroffalarm_whitelist",
     system_ext_specific: true,
-    sub_dir: "sysconfig",
+    relative_install_path: "sysconfig",
     src: "com.qualcomm.qti.poweroffalarm_whitelist.xml",
     filename_from_src: true,
 }
diff --git a/aidl/gadget/Android.bp b/aidl/gadget/Android.bp
index 8f02d2e..a82474c 100644
--- a/aidl/gadget/Android.bp
+++ b/aidl/gadget/Android.bp
@@ -12,8 +12,14 @@ cc_binary {
         "android.hardware.usb.gadget-service.xml",
     ],
     vendor: true,
-    srcs: ["service_gadget.cpp", "UsbGadget.cpp"],
-    cflags: ["-Wall", "-Werror"],
+    srcs: [
+        "service_gadget.cpp",
+        "UsbGadget.cpp",
+    ],
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
     shared_libs: [
         "libbase",
         "liblog",
diff --git a/aidl/usb/Android.bp b/aidl/usb/Android.bp
index 9f31bb6..4754fcf 100644
--- a/aidl/usb/Android.bp
+++ b/aidl/usb/Android.bp
@@ -9,7 +9,7 @@ soong_config_module_type {
     module_type: "cc_defaults",
     config_namespace: "android_hardware_mediatek_usb",
     bool_variables: [
-        "audio_accessory_supported"
+        "audio_accessory_supported",
     ],
     properties: ["cflags"],
 }
@@ -19,16 +19,16 @@ android_hardware_usb_mediatek_config_default {
     soong_config_variables: {
         audio_accessory_supported: {
             cflags: ["-DUSB_AUDIO_ACCESSORY_SUPPORTED"],
-        }
-    }
+        },
+    },
 }
 
 cc_binary {
     name: "android.hardware.usb-service.mediatek",
+    defaults: ["android_hardware_usb_mediatek_config_defaults"],
     relative_install_path: "hw",
     init_rc: ["android.hardware.usb-service.mediatek.rc"],
     vintf_fragments: ["android.hardware.usb-service.mediatek.xml"],
-    defaults: ["android_hardware_usb_mediatek_config_defaults"],
     vendor: true,
     srcs: [
         "service.cpp",
diff --git a/create_pl_dev/Android.bp b/create_pl_dev/Android.bp
index db2da4d..3e4ddd3 100644
--- a/create_pl_dev/Android.bp
+++ b/create_pl_dev/Android.bp
@@ -9,7 +9,7 @@ cc_binary {
     init_rc: ["create_pl_dev.rc"],
     recovery_available: true,
     static_libs: [
-        "libfs_mgr"
+        "libfs_mgr",
     ],
     shared_libs: [
         "libbase",
diff --git a/interfaces/Android.bp b/interfaces/Android.bp
index 1859465..eac0e10 100644
--- a/interfaces/Android.bp
+++ b/interfaces/Android.bp
@@ -1,5 +1,5 @@
 subdirs = [
-    "*"
+    "*",
 ]
 
 hidl_package_root {
diff --git a/libmtkperf_client/Android.bp b/libmtkperf_client/Android.bp
index d147c76..2d15c3b 100644
--- a/libmtkperf_client/Android.bp
+++ b/libmtkperf_client/Android.bp
@@ -16,13 +16,13 @@ cc_defaults {
 cc_defaults {
     name: "libpowerhalwrap_defaults",
     srcs: ["powerhalwrap_vendor.c"],
-    shared_libs: ["liblog"]
+    shared_libs: ["liblog"],
 }
 
 cc_library_shared {
     name: "libmtkperf_client_vendor",
-    vendor: true,
     defaults: ["libmtkperf_client_defaults"],
+    vendor: true,
 }
 
 cc_library_shared {
@@ -37,6 +37,6 @@ cc_library_shared {
 
 cc_library_shared {
     name: "libpowerhalwrap_vendor",
-    vendor: true,
     defaults: ["libpowerhalwrap_defaults"],
+    vendor: true,
 }
diff --git a/libwifi-hal-wrapper/Android.bp b/libwifi-hal-wrapper/Android.bp
index 6440d66..2d18d50 100644
--- a/libwifi-hal-wrapper/Android.bp
+++ b/libwifi-hal-wrapper/Android.bp
@@ -24,6 +24,6 @@ cc_library_shared {
 prebuilt_etc {
     name: "libwifi-hal-wrapper.xml",
     src: "libwifi-hal-wrapper.xml",
-    sub_dir: "wifi/vendor_hals",
+    relative_install_path: "wifi/vendor_hals",
     vendor: true,
 }