add support for ignoring vendor files in specific device and api rath…

…er than only global file ignore
hashbang · Sep 10, 2019 · 1575912 · 1575912
1 parent 70631ae
commit 1575912
Show file tree

Hide file tree

Showing 12 changed files with 130 additions and 62 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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": []
     }
   }
 }