From cbfc9d223b7d33c8eabb2c6cd709bc61ca71f921 Mon Sep 17 00:00:00 2001
From: Dmitry Muhomor <muhomor.dmitry@gmail.com>
Date: Fri, 6 Oct 2023 16:02:05 +0300
Subject: [PATCH] include atcmdfwd-saidl.xml vintf

It was previously included manually in device/google/redbull because of non-standard XML formatting,
which is now handled by adevtool.
---
 config/device/common/gen5pixel.yml                       | 1 -
 vendor-skels/google_devices/barbet/proprietary-files.txt | 1 +
 .../google_devices/barbet/proprietary/Android.bp.skip    | 9 +++++++++
 .../barbet/proprietary/device-vendor.mk.skip             | 1 +
 .../google_devices/bramble/proprietary-files.txt         | 1 +
 .../google_devices/bramble/proprietary/Android.bp.skip   | 9 +++++++++
 .../bramble/proprietary/device-vendor.mk.skip            | 1 +
 vendor-skels/google_devices/redfin/proprietary-files.txt | 1 +
 .../google_devices/redfin/proprietary/Android.bp.skip    | 9 +++++++++
 .../redfin/proprietary/device-vendor.mk.skip             | 1 +
 vendor-specs/google_devices/barbet.yml                   | 9 ++++++---
 vendor-specs/google_devices/bramble.yml                  | 9 ++++++---
 vendor-specs/google_devices/redfin.yml                   | 9 ++++++---
 13 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/config/device/common/gen5pixel.yml b/config/device/common/gen5pixel.yml
index f9a936a..8f839e1 100644
--- a/config/device/common/gen5pixel.yml
+++ b/config/device/common/gen5pixel.yml
@@ -10,7 +10,6 @@ filters:
     match:
       - vendor/etc/vintf/manifest/manifest_wifi_ext.xml
       - vendor/etc/vintf/manifest/manifest_wifi_ext_aidl.xml
-      - system_ext/etc/vintf/manifest/atcmdfwd-saidl.xml
 
   dep_files:
     match:
diff --git a/vendor-skels/google_devices/barbet/proprietary-files.txt b/vendor-skels/google_devices/barbet/proprietary-files.txt
index 9168734..931c2ea 100644
--- a/vendor-skels/google_devices/barbet/proprietary-files.txt
+++ b/vendor-skels/google_devices/barbet/proprietary-files.txt
@@ -35,6 +35,7 @@ system_ext/etc/permissions/qti_telephony_utils.xml
 system_ext/etc/seccomp_policy/sxraux-arm.policy
 system_ext/etc/seccomp_policy/tcmd.policy
 system_ext/etc/sysconfig/qti_telephony_system_packages_config.xml
+system_ext/etc/vintf/manifest/atcmdfwd-saidl.xml
 system_ext/framework/ActivityExt.jar
 system_ext/framework/audiosphere.jar
 system_ext/framework/com.google.android.camera.extensions.jar
diff --git a/vendor-skels/google_devices/barbet/proprietary/Android.bp.skip b/vendor-skels/google_devices/barbet/proprietary/Android.bp.skip
index e18350f..96d25e3 100644
--- a/vendor-skels/google_devices/barbet/proprietary/Android.bp.skip
+++ b/vendor-skels/google_devices/barbet/proprietary/Android.bp.skip
@@ -14595,6 +14595,15 @@ prebuilt_etc_xml {
     product_specific: true,
 }
 
+prebuilt_etc_xml {
+    name: "atcmdfwd-saidl",
+    owner: "google_devices",
+    src: "system_ext/etc/vintf/manifest/atcmdfwd-saidl.xml",
+    filename_from_src: true,
+    sub_dir: "vintf/manifest",
+    system_ext_specific: true,
+}
+
 prebuilt_etc_xml {
     name: "android.hardware.authsecret-service.citadel__2",
     owner: "google_devices",
diff --git a/vendor-skels/google_devices/barbet/proprietary/device-vendor.mk.skip b/vendor-skels/google_devices/barbet/proprietary/device-vendor.mk.skip
index 4498364..1c21109 100644
--- a/vendor-skels/google_devices/barbet/proprietary/device-vendor.mk.skip
+++ b/vendor-skels/google_devices/barbet/proprietary/device-vendor.mk.skip
@@ -148,6 +148,7 @@ PRODUCT_PACKAGES += \
     android.hidl.memory.block@1.0.vendor \
     android.system.net.netd@1.0.vendor:64 \
     android.system.net.netd@1.1.vendor:64 \
+    atcmdfwd-saidl \
     atfwd \
     audio.primary.lito \
     audiosphere \
diff --git a/vendor-skels/google_devices/bramble/proprietary-files.txt b/vendor-skels/google_devices/bramble/proprietary-files.txt
index bbe55d4..7932789 100644
--- a/vendor-skels/google_devices/bramble/proprietary-files.txt
+++ b/vendor-skels/google_devices/bramble/proprietary-files.txt
@@ -36,6 +36,7 @@ system_ext/etc/permissions/qti_telephony_utils.xml
 system_ext/etc/seccomp_policy/sxraux-arm.policy
 system_ext/etc/seccomp_policy/tcmd.policy
 system_ext/etc/sysconfig/qti_telephony_system_packages_config.xml
+system_ext/etc/vintf/manifest/atcmdfwd-saidl.xml
 system_ext/framework/ActivityExt.jar
 system_ext/framework/audiosphere.jar
 system_ext/framework/com.google.android.camera.experimental2022_system.jar
diff --git a/vendor-skels/google_devices/bramble/proprietary/Android.bp.skip b/vendor-skels/google_devices/bramble/proprietary/Android.bp.skip
index 6448799..e8158fd 100644
--- a/vendor-skels/google_devices/bramble/proprietary/Android.bp.skip
+++ b/vendor-skels/google_devices/bramble/proprietary/Android.bp.skip
@@ -14650,6 +14650,15 @@ prebuilt_etc_xml {
     product_specific: true,
 }
 
+prebuilt_etc_xml {
+    name: "atcmdfwd-saidl",
+    owner: "google_devices",
+    src: "system_ext/etc/vintf/manifest/atcmdfwd-saidl.xml",
+    filename_from_src: true,
+    sub_dir: "vintf/manifest",
+    system_ext_specific: true,
+}
+
 prebuilt_etc_xml {
     name: "android.hardware.authsecret-service.citadel__2",
     owner: "google_devices",
diff --git a/vendor-skels/google_devices/bramble/proprietary/device-vendor.mk.skip b/vendor-skels/google_devices/bramble/proprietary/device-vendor.mk.skip
index f7c8e79..539e289 100644
--- a/vendor-skels/google_devices/bramble/proprietary/device-vendor.mk.skip
+++ b/vendor-skels/google_devices/bramble/proprietary/device-vendor.mk.skip
@@ -148,6 +148,7 @@ PRODUCT_PACKAGES += \
     android.hidl.memory.block@1.0.vendor \
     android.system.net.netd@1.0.vendor:64 \
     android.system.net.netd@1.1.vendor:64 \
+    atcmdfwd-saidl \
     atfwd \
     audio.primary.lito \
     audiosphere \
diff --git a/vendor-skels/google_devices/redfin/proprietary-files.txt b/vendor-skels/google_devices/redfin/proprietary-files.txt
index 2e95d5f..bf1b93a 100644
--- a/vendor-skels/google_devices/redfin/proprietary-files.txt
+++ b/vendor-skels/google_devices/redfin/proprietary-files.txt
@@ -36,6 +36,7 @@ system_ext/etc/permissions/qti_telephony_utils.xml
 system_ext/etc/seccomp_policy/sxraux-arm.policy
 system_ext/etc/seccomp_policy/tcmd.policy
 system_ext/etc/sysconfig/qti_telephony_system_packages_config.xml
+system_ext/etc/vintf/manifest/atcmdfwd-saidl.xml
 system_ext/framework/ActivityExt.jar
 system_ext/framework/audiosphere.jar
 system_ext/framework/com.google.android.camera.experimental2022_system.jar
diff --git a/vendor-skels/google_devices/redfin/proprietary/Android.bp.skip b/vendor-skels/google_devices/redfin/proprietary/Android.bp.skip
index 3110690..4c406f5 100644
--- a/vendor-skels/google_devices/redfin/proprietary/Android.bp.skip
+++ b/vendor-skels/google_devices/redfin/proprietary/Android.bp.skip
@@ -14703,6 +14703,15 @@ prebuilt_etc_xml {
     product_specific: true,
 }
 
+prebuilt_etc_xml {
+    name: "atcmdfwd-saidl",
+    owner: "google_devices",
+    src: "system_ext/etc/vintf/manifest/atcmdfwd-saidl.xml",
+    filename_from_src: true,
+    sub_dir: "vintf/manifest",
+    system_ext_specific: true,
+}
+
 prebuilt_etc_xml {
     name: "android.hardware.authsecret-service.citadel__2",
     owner: "google_devices",
diff --git a/vendor-skels/google_devices/redfin/proprietary/device-vendor.mk.skip b/vendor-skels/google_devices/redfin/proprietary/device-vendor.mk.skip
index 9836a7a..7f063d9 100644
--- a/vendor-skels/google_devices/redfin/proprietary/device-vendor.mk.skip
+++ b/vendor-skels/google_devices/redfin/proprietary/device-vendor.mk.skip
@@ -148,6 +148,7 @@ PRODUCT_PACKAGES += \
     android.hidl.memory.block@1.0.vendor \
     android.system.net.netd@1.0.vendor:64 \
     android.system.net.netd@1.1.vendor:64 \
+    atcmdfwd-saidl \
     atfwd \
     audio.primary.lito \
     audiosphere \
diff --git a/vendor-specs/google_devices/barbet.yml b/vendor-specs/google_devices/barbet.yml
index c3f274e..7c83699 100644
--- a/vendor-specs/google_devices/barbet.yml
+++ b/vendor-specs/google_devices/barbet.yml
@@ -71,10 +71,10 @@ overlays/product_org.codeaurora.ims/res: dir
 overlays/product_org.codeaurora.ims/res/values: dir
 overlays/product_org.codeaurora.ims/res/values/values.xml: d740f1e01a2535a2382a3f40920d7ac4b90be155ce5726962b1f2041e40daca6
 proprietary: dir
-proprietary-files.txt: 1cf63ed6ac20440832c37454c9304c167e60dd550522f94b2305e12bc24c52d7
-proprietary/Android.bp: d5b6394cf54d78f74ba593b827d70a408e8ae9c0b6d8585c0166ccc37e927512
+proprietary-files.txt: 9267086b5a144446b2f75fe80ce64d844856f0e602a7b73e4dda6489f63a9c2a
+proprietary/Android.bp: 583a465b3cc5a1baef5cdb8717c024660e2a9a22b38c1028a44f1981621621db
 proprietary/BoardConfigVendor.mk: 5c24f479c707b4ade0485b3dc8166ea62b66ba253a27517af4142709bed4e724
-proprietary/device-vendor.mk: 44f1418eeebf20ad58a35fa16188d99d0e967a094ece5ca1fb6b2fecfb71d283
+proprietary/device-vendor.mk: 338c57a9a47a38d480f125de675a857bc69731a9254c1ea916b97bdfe98bf979
 proprietary/product: dir
 proprietary/product/app: dir
 proprietary/product/app/uimremoteclient: dir
@@ -448,6 +448,9 @@ proprietary/system_ext/etc/seccomp_policy/sxraux-arm.policy: cc0a0b382edeed1b79e
 proprietary/system_ext/etc/seccomp_policy/tcmd.policy: 7e26f0e5d93aa77bc4b1433e718169b6b9e8409715182d3cff3cc1cdf490198b
 proprietary/system_ext/etc/sysconfig: dir
 proprietary/system_ext/etc/sysconfig/qti_telephony_system_packages_config.xml: 4fda0c6e64ad8d6f10f6098401dd77c7218c60e89fa67600362eb84f8d807c80
+proprietary/system_ext/etc/vintf: dir
+proprietary/system_ext/etc/vintf/manifest: dir
+proprietary/system_ext/etc/vintf/manifest/atcmdfwd-saidl.xml: 1c1dbd32f7624edfe6cbd98e727de70ec61a7c20b10bd5ceff3249034a15b6e1
 proprietary/system_ext/framework: dir
 proprietary/system_ext/framework/ActivityExt.jar: de1f6bbd26c6293a4e9e1ed3b3d9bfcaeb387fe94161417762ffa0fcfb09ad74
 proprietary/system_ext/framework/audiosphere.jar: 682884e45bc718d1088025b26edbff29a468af5d4693942584eb35a26f29ef2f
diff --git a/vendor-specs/google_devices/bramble.yml b/vendor-specs/google_devices/bramble.yml
index ef0f32d..52236b0 100644
--- a/vendor-specs/google_devices/bramble.yml
+++ b/vendor-specs/google_devices/bramble.yml
@@ -71,10 +71,10 @@ overlays/product_org.codeaurora.ims/res: dir
 overlays/product_org.codeaurora.ims/res/values: dir
 overlays/product_org.codeaurora.ims/res/values/values.xml: d740f1e01a2535a2382a3f40920d7ac4b90be155ce5726962b1f2041e40daca6
 proprietary: dir
-proprietary-files.txt: 00edabfa65e5903c8f935e886d2007f4212abbf8919c815f71a8ae51be880e71
-proprietary/Android.bp: ccc6b7c279b9d79647fc142f8bd2a0dc4d9b146338e16e37e7952f66fcdeed24
+proprietary-files.txt: e24d80e8c70c380dc92b081446cd35b45d15672d1e7e3408a7967de1d0403df6
+proprietary/Android.bp: e99a7c746ac0070acef770a8984c71dda83d483a81e01c7ca2c851a202ca9956
 proprietary/BoardConfigVendor.mk: d18c602f104635718ddab70e06592a326173516cd11e6a3cd4e9d730d587ca5d
-proprietary/device-vendor.mk: 67210996a05501d65e6385813477255605d0089e9a87af7db67e85d011870f56
+proprietary/device-vendor.mk: 23f21446454e0746152cf8d63ca9d1b36afaa4352b842138455858ac39d3bba9
 proprietary/product: dir
 proprietary/product/app: dir
 proprietary/product/app/uimremoteclient: dir
@@ -450,6 +450,9 @@ proprietary/system_ext/etc/seccomp_policy/sxraux-arm.policy: cc0a0b382edeed1b79e
 proprietary/system_ext/etc/seccomp_policy/tcmd.policy: 7e26f0e5d93aa77bc4b1433e718169b6b9e8409715182d3cff3cc1cdf490198b
 proprietary/system_ext/etc/sysconfig: dir
 proprietary/system_ext/etc/sysconfig/qti_telephony_system_packages_config.xml: 4fda0c6e64ad8d6f10f6098401dd77c7218c60e89fa67600362eb84f8d807c80
+proprietary/system_ext/etc/vintf: dir
+proprietary/system_ext/etc/vintf/manifest: dir
+proprietary/system_ext/etc/vintf/manifest/atcmdfwd-saidl.xml: 1c1dbd32f7624edfe6cbd98e727de70ec61a7c20b10bd5ceff3249034a15b6e1
 proprietary/system_ext/framework: dir
 proprietary/system_ext/framework/ActivityExt.jar: de1f6bbd26c6293a4e9e1ed3b3d9bfcaeb387fe94161417762ffa0fcfb09ad74
 proprietary/system_ext/framework/audiosphere.jar: 682884e45bc718d1088025b26edbff29a468af5d4693942584eb35a26f29ef2f
diff --git a/vendor-specs/google_devices/redfin.yml b/vendor-specs/google_devices/redfin.yml
index 9b35155..b0d08f7 100644
--- a/vendor-specs/google_devices/redfin.yml
+++ b/vendor-specs/google_devices/redfin.yml
@@ -70,10 +70,10 @@ overlays/product_org.codeaurora.ims/res: dir
 overlays/product_org.codeaurora.ims/res/values: dir
 overlays/product_org.codeaurora.ims/res/values/values.xml: d740f1e01a2535a2382a3f40920d7ac4b90be155ce5726962b1f2041e40daca6
 proprietary: dir
-proprietary-files.txt: b22b0cdb02b67c992630465c43612c445d9bf3c8854da8501e4c39e63a9bc988
-proprietary/Android.bp: 95028dd9c861f1ef12d3800e1648e853203def538f72e638ee69b6dd761e255d
+proprietary-files.txt: 56863c21fc45363cc101ee2cea9fd8b675b1aa16deff811b9207524743fabfb3
+proprietary/Android.bp: 90449acd5321f9c7d440d2a102df9d5b134018206c1c7ea71372e9c5882d932e
 proprietary/BoardConfigVendor.mk: e2a1d661c8589a7df578205ea779987031189bf3af30d702e602772330fa6955
-proprietary/device-vendor.mk: 14fa787f7a48867a9e6ecbb43820c93715781a44acd27661be0c039e1849cd07
+proprietary/device-vendor.mk: 88d39bcbfaf78380ca184f7d25f31526eec3104f9c7a91f9e4f169f5cc5d7e4d
 proprietary/product: dir
 proprietary/product/app: dir
 proprietary/product/app/uimremoteclient: dir
@@ -450,6 +450,9 @@ proprietary/system_ext/etc/seccomp_policy/sxraux-arm.policy: cc0a0b382edeed1b79e
 proprietary/system_ext/etc/seccomp_policy/tcmd.policy: 7e26f0e5d93aa77bc4b1433e718169b6b9e8409715182d3cff3cc1cdf490198b
 proprietary/system_ext/etc/sysconfig: dir
 proprietary/system_ext/etc/sysconfig/qti_telephony_system_packages_config.xml: 4fda0c6e64ad8d6f10f6098401dd77c7218c60e89fa67600362eb84f8d807c80
+proprietary/system_ext/etc/vintf: dir
+proprietary/system_ext/etc/vintf/manifest: dir
+proprietary/system_ext/etc/vintf/manifest/atcmdfwd-saidl.xml: 1c1dbd32f7624edfe6cbd98e727de70ec61a7c20b10bd5ceff3249034a15b6e1
 proprietary/system_ext/framework: dir
 proprietary/system_ext/framework/ActivityExt.jar: de1f6bbd26c6293a4e9e1ed3b3d9bfcaeb387fe94161417762ffa0fcfb09ad74
 proprietary/system_ext/framework/audiosphere.jar: 682884e45bc718d1088025b26edbff29a468af5d4693942584eb35a26f29ef2f