diff --git a/angler/config.json b/angler/config.json
index 030cbc6f..3b827524 100644
--- a/angler/config.json
+++ b/angler/config.json
@@ -146,7 +146,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "",
@@ -168,7 +169,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     }
   },
   "api-24": {
@@ -272,7 +274,8 @@
         "    device/huawei/angler/fstab.angler:root/fstab.angler \\",
         "    $(PRODUCT_COPY_FILES)"
       ],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "",
@@ -299,7 +302,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     }
   },
   "api-25": {
@@ -403,7 +407,8 @@
         "    device/huawei/angler/fstab.angler:root/fstab.angler \\",
         "    $(PRODUCT_COPY_FILES)"
       ],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "",
@@ -429,7 +434,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     }
   },
   "api-26": {
@@ -532,7 +538,8 @@
         "    device/huawei/angler/fstab.angler:root/fstab.angler \\",
         "    $(PRODUCT_COPY_FILES)"
       ],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "",
@@ -560,7 +567,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     }
   },
 "api-27": {
@@ -664,7 +672,8 @@
         "    device/huawei/angler/fstab.angler:root/fstab.angler \\",
         "    $(PRODUCT_COPY_FILES)"
       ],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "",
@@ -692,7 +701,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     }
   }
 }
diff --git a/blueline/config.json b/blueline/config.json
index 683b8fcb..85f7220d 100644
--- a/blueline/config.json
+++ b/blueline/config.json
@@ -211,7 +211,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "",
@@ -272,7 +273,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     }
   }
 }
diff --git a/bonito/config.json b/bonito/config.json
index 9ec37315..a3f8e270 100644
--- a/bonito/config.json
+++ b/bonito/config.json
@@ -269,7 +269,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "",
@@ -339,7 +340,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     }
   }
 }
diff --git a/bullhead/config.json b/bullhead/config.json
index 6c04b860..3f3d4f22 100644
--- a/bullhead/config.json
+++ b/bullhead/config.json
@@ -123,7 +123,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "",
@@ -142,7 +143,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     }
   },
   "api-24": {
@@ -285,7 +287,8 @@
         "    device/lge/bullhead/fstab.bullhead:root/fstab.bullhead \\",
         "    $(PRODUCT_COPY_FILES)"
       ],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "",
@@ -311,7 +314,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     }
   },
   "api-25": {
@@ -455,7 +459,8 @@
         "    device/lge/bullhead/fstab.bullhead:root/fstab.bullhead \\",
         "    $(PRODUCT_COPY_FILES)"
       ],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "",
@@ -480,7 +485,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     }
   },
   "api-26": {
@@ -604,7 +610,8 @@
         "    device/lge/bullhead/fstab.bullhead:root/fstab.bullhead \\",
         "    $(PRODUCT_COPY_FILES)"
       ],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "overlays-api26-full",
@@ -631,7 +638,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     }
   },
   "api-27": {
@@ -755,7 +763,8 @@
         "    device/lge/bullhead/fstab.bullhead:root/fstab.bullhead \\",
         "    $(PRODUCT_COPY_FILES)"
       ],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "overlays-api26-full",
@@ -782,7 +791,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     }
   }
 }
diff --git a/crosshatch/config.json b/crosshatch/config.json
index f419c55e..a71a5e4b 100644
--- a/crosshatch/config.json
+++ b/crosshatch/config.json
@@ -211,7 +211,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "",
@@ -272,7 +273,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     }
   }
 }
diff --git a/flounder/config.json b/flounder/config.json
index 18935f2d..00766f27 100644
--- a/flounder/config.json
+++ b/flounder/config.json
@@ -23,7 +23,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "",
@@ -33,7 +34,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     }
   },
   "api-24": {
@@ -49,7 +51,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "",
@@ -59,7 +62,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     }
   },
   "api-25": {
@@ -75,7 +79,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "",
@@ -85,7 +90,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     }
   }
 }
diff --git a/marlin/config.json b/marlin/config.json
index 070ebf35..0941eea1 100644
--- a/marlin/config.json
+++ b/marlin/config.json
@@ -191,7 +191,8 @@
         "PRODUCT_PROPERTY_OVERRIDES += \\",
         "    ro.hardware.egl=adreno \\",
         "    ro.hardware.fingerprint=fpc"
-      ]
+      ],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "",
@@ -230,7 +231,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     }
   },
   "api-26": {
@@ -277,7 +279,8 @@
         "PRODUCT_PROPERTY_OVERRIDES += \\",
         "    ro.hardware.egl=adreno \\",
         "    ro.hardware.fingerprint=fpc"
-      ]
+      ],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "overlays-api26-full",
@@ -349,7 +352,8 @@
         "    ro.wallpapers_loc_request_suw=true \\",
         "    ro.opa.eligible_device=true \\",
         "    ro.storage_manager.enabled=true"
-      ]
+      ],
+      "vendor-skip-files": []
     }
   },
   "api-27": {
@@ -405,7 +409,8 @@
         "    ro.hardware.egl=adreno \\",
         "    ro.hardware.fingerprint=fpc \\",
         "    ro.control_privapp_permissions=enforce"
-      ]
+      ],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "overlays-api26-full",
@@ -477,7 +482,8 @@
         "    ro.wallpapers_loc_request_suw=true \\",
         "    ro.opa.eligible_device=true \\",
         "    ro.storage_manager.enabled=true"
-      ]
+      ],
+      "vendor-skip-files": []
     }
   },
   "api-28": {
@@ -536,7 +542,8 @@
       "device-vendor": [
         "PRODUCT_PROPERTY_OVERRIDES += \\",
         "    ro.control_privapp_permissions=enforce"
-      ]
+      ],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "overlays-api26-full",
@@ -615,7 +622,8 @@
         "    ro.opa.eligible_device=true \\",
         "    ro.storage_manager.enabled=true \\",
         "    ro.boot.vendor.overlay.theme=com.google.android.theme.pixel"
-      ]
+      ],
+      "vendor-skip-files": []
     }
   }
 }
diff --git a/sailfish/config.json b/sailfish/config.json
index 009a21e0..aa8486f9 100644
--- a/sailfish/config.json
+++ b/sailfish/config.json
@@ -191,7 +191,8 @@
         "PRODUCT_PROPERTY_OVERRIDES += \\",
         "    ro.hardware.egl=adreno \\",
         "    ro.hardware.fingerprint=fpc"
-      ]
+      ],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "",
@@ -230,7 +231,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     }
   },
   "api-26": {
@@ -277,7 +279,8 @@
         "PRODUCT_PROPERTY_OVERRIDES += \\",
         "    ro.hardware.egl=adreno \\",
         "    ro.hardware.fingerprint=fpc"
-      ]
+      ],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "overlays-api26-full",
@@ -348,7 +351,8 @@
         "    ro.wallpapers_loc_request_suw=true \\",
         "    ro.opa.eligible_device=true \\",
         "    ro.storage_manager.enabled=true"
-      ]
+      ],
+      "vendor-skip-files": []
     }
   },
   "api-27": {
@@ -405,7 +409,8 @@
         "    ro.hardware.egl=adreno \\",
         "    ro.hardware.fingerprint=fpc \\",
         "    ro.control_privapp_permissions=enforce"
-      ]
+      ],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "overlays-api26-full",
@@ -477,7 +482,8 @@
         "    ro.wallpapers_loc_request_suw=true \\",
         "    ro.opa.eligible_device=true \\",
         "    ro.storage_manager.enabled=true"
-      ]
+      ],
+      "vendor-skip-files": []
     }
   },
   "api-28": {
@@ -536,7 +542,8 @@
       "device-vendor": [
         "PRODUCT_PROPERTY_OVERRIDES += \\",
         "    ro.control_privapp_permissions=enforce"
-      ]
+      ],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "overlays-api26-full",
@@ -615,7 +622,8 @@
         "    ro.opa.eligible_device=true \\",
         "    ro.storage_manager.enabled=true \\",
         "    ro.boot.vendor.overlay.theme=com.google.android.theme.pixel"
-      ]
+      ],
+      "vendor-skip-files": []
     }
   }
 }
diff --git a/sargo/config.json b/sargo/config.json
index b5a82280..14573ffd 100644
--- a/sargo/config.json
+++ b/sargo/config.json
@@ -272,7 +272,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "",
@@ -342,7 +343,8 @@
       "new-modules": [],
       "dep-dso": [],
       "BoardConfigVendor": [],
-      "device-vendor": []
+      "device-vendor": [],
+      "vendor-skip-files": []
     }
   }
 }
diff --git a/scripts/gen-prop-blobs-list.sh b/scripts/gen-prop-blobs-list.sh
index acfd71ed..f2673aa4 100755
--- a/scripts/gen-prop-blobs-list.sh
+++ b/scripts/gen-prop-blobs-list.sh
@@ -129,6 +129,12 @@ do
     fi
   fi
 
+  # Skip vendor files for specific APIs if they are defined
+  readarray -t vendorSkipFiles < <(jqIncRawArray "$API_LEVEL" "$CONFIG_TYPE" "vendor-skip-files" "$CONFIG_FILE")
+  if array_contains "$FILE" "${vendorSkipFiles[@]}"; then
+    continue
+  fi
+
   echo "vendor/$FILE" >> "$OUT_BLOBS_FILE_TMP"
 done
 
diff --git a/taimen/config.json b/taimen/config.json
index 7e91d126..9f28ae92 100644
--- a/taimen/config.json
+++ b/taimen/config.json
@@ -93,7 +93,8 @@
         "    ro.gfx.driver.0=com.google.pixel.wahoo.gfxdrv \\",
         "    ro.oem_unlock.pst=/dev/block/platform/soc/1da4000.ufshc/by-name/misc \\",
         "    ro.oem_unlock.pst_offset=6144"
-      ]
+      ],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "",
@@ -158,7 +159,8 @@
         "    ro.facelock.det_timeout=2500 \\",
         "    ro.facelock.rec_timeout=3500 \\",
         "    ro.facelock.est_max_time=600"
-      ]
+      ],
+      "vendor-skip-files": []
     }
   },
   "api-27": {
@@ -229,7 +231,8 @@
         "    ro.gfx.driver.0=com.google.pixel.wahoo.gfxdrv \\",
         "    ro.oem_unlock.pst=/dev/block/platform/soc/1da4000.ufshc/by-name/misc \\",
         "    ro.oem_unlock.pst_offset=6144"
-      ]
+      ],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "",
@@ -295,7 +298,8 @@
         "    ro.facelock.det_timeout=2500 \\",
         "    ro.facelock.rec_timeout=3500 \\",
         "    ro.facelock.est_max_time=600"
-      ]
+      ],
+      "vendor-skip-files": []
     }
   },
 "api-28": {
@@ -379,7 +383,8 @@
         "    ro.gfx.driver.0=com.google.pixel.wahoo.gfxdrv \\",
         "    ro.oem_unlock.pst=/dev/block/platform/soc/1da4000.ufshc/by-name/misc \\",
         "    ro.oem_unlock.pst_offset=6144"
-      ]
+      ],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "",
@@ -450,7 +455,8 @@
         "    ro.facelock.det_timeout=2500 \\",
         "    ro.facelock.rec_timeout=3500 \\",
         "    ro.facelock.est_max_time=600"
-      ]
+      ],
+      "vendor-skip-files": []
     }
   }
 }
diff --git a/walleye/config.json b/walleye/config.json
index d77ade27..96ce173a 100644
--- a/walleye/config.json
+++ b/walleye/config.json
@@ -93,7 +93,8 @@
         "    ro.gfx.driver.0=com.google.pixel.wahoo.gfxdrv \\",
         "    ro.oem_unlock.pst=/dev/block/platform/soc/1da4000.ufshc/by-name/misc \\",
         "    ro.oem_unlock.pst_offset=6144"
-      ]
+      ],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "",
@@ -161,7 +162,8 @@
         "    ro.facelock.det_timeout=2500 \\",
         "    ro.facelock.rec_timeout=3500 \\",
         "    ro.facelock.est_max_time=600"
-      ]
+      ],
+      "vendor-skip-files": []
     }
   },
   "api-27": {
@@ -232,7 +234,8 @@
         "    ro.gfx.driver.0=com.google.pixel.wahoo.gfxdrv \\",
         "    ro.oem_unlock.pst=/dev/block/platform/soc/1da4000.ufshc/by-name/misc \\",
         "    ro.oem_unlock.pst_offset=6144"
-      ]
+      ],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "",
@@ -301,7 +304,8 @@
         "    ro.facelock.det_timeout=2500 \\",
         "    ro.facelock.rec_timeout=3500 \\",
         "    ro.facelock.est_max_time=600"
-      ]
+      ],
+      "vendor-skip-files": []
     }
   },
   "api-28": {
@@ -385,7 +389,8 @@
         "    ro.gfx.driver.0=com.google.pixel.wahoo.gfxdrv \\",
         "    ro.oem_unlock.pst=/dev/block/platform/soc/1da4000.ufshc/by-name/misc \\",
         "    ro.oem_unlock.pst_offset=6144"
-      ]
+      ],
+      "vendor-skip-files": []
     },
     "full": {
       "overlays-dir": "",
@@ -456,7 +461,8 @@
         "    ro.facelock.det_timeout=2500 \\",
         "    ro.facelock.rec_timeout=3500 \\",
         "    ro.facelock.est_max_time=600"
-      ]
+      ],
+      "vendor-skip-files": []
     }
   }
 }