diff --git a/Euicc/Android.bp b/Euicc/Android.bp
index 04b2290..aa141ce 100644
--- a/Euicc/Android.bp
+++ b/Euicc/Android.bp
@@ -8,7 +8,6 @@ android_app {
     name: "OplusEuicc",
 
     srcs: ["src/**/*.kt"],
-    resource_dirs: ["res"],
 
     sdk_version: "current",
     product_specific: true,
@@ -25,16 +24,16 @@ android_app {
 }
 
 prebuilt_etc {
-    sub_dir: "permissions",
     name: "org.lineageos.euicc.xml",
+    relative_install_path: "permissions",
     filename: "org.lineageos.euicc.xml",
     src: "org.lineageos.euicc.xml",
     product_specific: true,
 }
 
 prebuilt_etc {
-    sub_dir: "sysconfig",
     name: "hidden-api-whitelist-org.lineageos.euicc.xml",
+    relative_install_path: "sysconfig",
     filename: "hidden-api-whitelist-org.lineageos.euicc.xml",
     src: "hidden-api-whitelist-org.lineageos.euicc.xml",
     product_specific: true,
diff --git a/KeyHandler/Android.bp b/KeyHandler/Android.bp
index d7a082f..96d6a05 100644
--- a/KeyHandler/Android.bp
+++ b/KeyHandler/Android.bp
@@ -2,7 +2,6 @@ android_app {
     name: "KeyHandler",
 
     srcs: ["src/**/*.kt"],
-    resource_dirs: ["res"],
 
     certificate: "platform",
     platform_apis: true,
diff --git a/aidl/vibrator/qti/Android.bp b/aidl/vibrator/qti/Android.bp
index cc84282..970d486 100644
--- a/aidl/vibrator/qti/Android.bp
+++ b/aidl/vibrator/qti/Android.bp
@@ -21,7 +21,7 @@ cc_library_shared {
         "true": ["liboplusvibratoreffect"],
         default: [],
     }),
-    export_include_dirs: ["include"]
+    export_include_dirs: ["include"],
 }
 
 cc_binary {
diff --git a/doze/Android.bp b/doze/Android.bp
index 3a0c0b8..7cf71c0 100644
--- a/doze/Android.bp
+++ b/doze/Android.bp
@@ -3,7 +3,6 @@ android_app {
     defaults: ["SettingsLibDefaults"],
 
     srcs: ["src/**/*.kt"],
-    resource_dirs: ["res"],
 
     certificate: "platform",
     platform_apis: true,