From 075e3bce342065a3ab7a898881df68d73c9cb914 Mon Sep 17 00:00:00 2001
From: flawedworld <flawedworld@flawed.world>
Date: Thu, 28 Jul 2022 17:53:11 +0100
Subject: [PATCH] Initial 6a port

---
 config/bluejay.yml             | 12 ++++++++++++
 config/common/file-removal.yml |  5 +++++
 2 files changed, 17 insertions(+)

diff --git a/config/bluejay.yml b/config/bluejay.yml
index 3f3d469..40d2deb 100644
--- a/config/bluejay.yml
+++ b/config/bluejay.yml
@@ -3,3 +3,15 @@ device:
 
 platform:
   product_makefile: device/google/bluejay/aosp_bluejay.mk
+
+includes:
+  - common/gen6pixel.yml
+
+filters:
+  overlay_files:
+    match:
+      # aapt2 parsing bug encountered within adevtool
+      - HbmSVManager__auto_generated_rro_product.apk
+  files:
+    match:
+      - vendor/etc/sysconfig/component-overrides.xml
diff --git a/config/common/file-removal.yml b/config/common/file-removal.yml
index 61942ff..23f3da2 100644
--- a/config/common/file-removal.yml
+++ b/config/common/file-removal.yml
@@ -27,6 +27,7 @@ filters:
       - product/etc/sysconfig/pixel_experience_2020.xml
       - product/etc/sysconfig/pixel_experience_2021_midyear.xml
       - product/etc/sysconfig/pixel_experience_2021.xml
+      - product/etc/sysconfig/pixel_experience_2022_midyear.xml
       - product/etc/sysconfig/preinstalled-packages-product-pixel-2017-and-newer.xml
       - product/etc/permissions/com.google.android.apps.diagnosticstool.xml
       - product/etc/permissions/com.google.android.dialer.support.xml
@@ -72,6 +73,10 @@ filters:
       # ssrestart files
       - vendor/etc/init/init.sscoredump.rc
       - vendor/bin/sscoredump
+      # odm useless
+      - vendor/odm/etc/NOTICE.xml.gz
+      - vendor/odm_dlkm/etc/build.prop
+      - vendor/odm_dlkm/etc/NOTICE.xml.gz
     suffix:
       # Precompiled content
       - .art