diff --git a/config/device/cheetah.yml b/config/device/cheetah.yml
index b351f6a..97a6c27 100644
--- a/config/device/cheetah.yml
+++ b/config/device/cheetah.yml
@@ -6,3 +6,4 @@ platform:
 
 includes:
   - common/gen7pixel.yml
+  - common/gs-wireless-charger.yml
diff --git a/config/device/common/gs-wireless-charger.yml b/config/device/common/gs-wireless-charger.yml
new file mode 100644
index 0000000..609c952
--- /dev/null
+++ b/config/device/common/gs-wireless-charger.yml
@@ -0,0 +1,3 @@
+platform:
+  extra_product_makefiles:
+    - device/google/gs-common/wireless_charger/wireless_charger.mk
diff --git a/config/device/felix.yml b/config/device/felix.yml
index e90b9e6..1bacb85 100644
--- a/config/device/felix.yml
+++ b/config/device/felix.yml
@@ -7,3 +7,4 @@ platform:
 
 includes:
   - common/gen7pixel.yml
+  - common/gs-wireless-charger.yml
diff --git a/config/device/lynx.yml b/config/device/lynx.yml
index cc38061..8561605 100644
--- a/config/device/lynx.yml
+++ b/config/device/lynx.yml
@@ -6,3 +6,4 @@ platform:
 
 includes:
   - common/gen7pixel.yml
+  - common/gs-wireless-charger.yml
diff --git a/config/device/oriole.yml b/config/device/oriole.yml
index 1e03df6..2f1698d 100644
--- a/config/device/oriole.yml
+++ b/config/device/oriole.yml
@@ -6,3 +6,4 @@ platform:
 
 includes:
   - common/gen6pixel.yml
+  - common/gs-wireless-charger.yml
diff --git a/config/device/panther.yml b/config/device/panther.yml
index 3244073..17318be 100644
--- a/config/device/panther.yml
+++ b/config/device/panther.yml
@@ -6,3 +6,4 @@ platform:
 
 includes:
   - common/gen7pixel.yml
+  - common/gs-wireless-charger.yml
diff --git a/config/device/raven.yml b/config/device/raven.yml
index 2f3b41a..7146aab 100644
--- a/config/device/raven.yml
+++ b/config/device/raven.yml
@@ -6,3 +6,4 @@ platform:
 
 includes:
   - common/gen6pixel.yml
+  - common/gs-wireless-charger.yml
diff --git a/vendor-skels/google_devices/cheetah/cheetah.mk.skip b/vendor-skels/google_devices/cheetah/cheetah.mk.skip
index a3af545..b1dee3c 100644
--- a/vendor-skels/google_devices/cheetah/cheetah.mk.skip
+++ b/vendor-skels/google_devices/cheetah/cheetah.mk.skip
@@ -10,6 +10,8 @@ PRODUCT_MODEL := Pixel 7 Pro
 PRODUCT_BRAND := google
 PRODUCT_MANUFACTURER := Google
 
+include device/google/gs-common/wireless_charger/wireless_charger.mk
+
 ifneq ($(BUILD_ID),UP1A.231005.007)
   $(error BUILD_ID: expected UP1A.231005.007, got $(BUILD_ID))
 endif
diff --git a/vendor-skels/google_devices/felix/felix.mk.skip b/vendor-skels/google_devices/felix/felix.mk.skip
index 7017d74..afc0a14 100644
--- a/vendor-skels/google_devices/felix/felix.mk.skip
+++ b/vendor-skels/google_devices/felix/felix.mk.skip
@@ -10,6 +10,8 @@ PRODUCT_MODEL := Pixel Fold
 PRODUCT_BRAND := google
 PRODUCT_MANUFACTURER := Google
 
+include device/google/gs-common/wireless_charger/wireless_charger.mk
+
 ifneq ($(BUILD_ID),UP1A.231005.007)
   $(error BUILD_ID: expected UP1A.231005.007, got $(BUILD_ID))
 endif
diff --git a/vendor-skels/google_devices/lynx/lynx.mk.skip b/vendor-skels/google_devices/lynx/lynx.mk.skip
index 964c484..d50e37d 100644
--- a/vendor-skels/google_devices/lynx/lynx.mk.skip
+++ b/vendor-skels/google_devices/lynx/lynx.mk.skip
@@ -10,6 +10,8 @@ PRODUCT_MODEL := Pixel 7a
 PRODUCT_BRAND := google
 PRODUCT_MANUFACTURER := Google
 
+include device/google/gs-common/wireless_charger/wireless_charger.mk
+
 ifneq ($(BUILD_ID),UP1A.231005.007)
   $(error BUILD_ID: expected UP1A.231005.007, got $(BUILD_ID))
 endif
diff --git a/vendor-skels/google_devices/oriole/oriole.mk.skip b/vendor-skels/google_devices/oriole/oriole.mk.skip
index cec5b7b..181fe03 100644
--- a/vendor-skels/google_devices/oriole/oriole.mk.skip
+++ b/vendor-skels/google_devices/oriole/oriole.mk.skip
@@ -10,6 +10,8 @@ PRODUCT_MODEL := Pixel 6
 PRODUCT_BRAND := google
 PRODUCT_MANUFACTURER := Google
 
+include device/google/gs-common/wireless_charger/wireless_charger.mk
+
 ifneq ($(BUILD_ID),UP1A.231005.007)
   $(error BUILD_ID: expected UP1A.231005.007, got $(BUILD_ID))
 endif
diff --git a/vendor-skels/google_devices/panther/panther.mk.skip b/vendor-skels/google_devices/panther/panther.mk.skip
index d849427..0ba0c51 100644
--- a/vendor-skels/google_devices/panther/panther.mk.skip
+++ b/vendor-skels/google_devices/panther/panther.mk.skip
@@ -10,6 +10,8 @@ PRODUCT_MODEL := Pixel 7
 PRODUCT_BRAND := google
 PRODUCT_MANUFACTURER := Google
 
+include device/google/gs-common/wireless_charger/wireless_charger.mk
+
 ifneq ($(BUILD_ID),UP1A.231005.007)
   $(error BUILD_ID: expected UP1A.231005.007, got $(BUILD_ID))
 endif
diff --git a/vendor-skels/google_devices/raven/raven.mk.skip b/vendor-skels/google_devices/raven/raven.mk.skip
index e0a91e5..52958f1 100644
--- a/vendor-skels/google_devices/raven/raven.mk.skip
+++ b/vendor-skels/google_devices/raven/raven.mk.skip
@@ -10,6 +10,8 @@ PRODUCT_MODEL := Pixel 6 Pro
 PRODUCT_BRAND := google
 PRODUCT_MANUFACTURER := Google
 
+include device/google/gs-common/wireless_charger/wireless_charger.mk
+
 ifneq ($(BUILD_ID),UP1A.231005.007)
   $(error BUILD_ID: expected UP1A.231005.007, got $(BUILD_ID))
 endif
diff --git a/vendor-specs/google_devices/cheetah.yml b/vendor-specs/google_devices/cheetah.yml
index a8664e5..a5c5231 100644
--- a/vendor-specs/google_devices/cheetah.yml
+++ b/vendor-specs/google_devices/cheetah.yml
@@ -2,7 +2,7 @@ Android.bp: c9ffd08891ecb53ae8e9094354e795dd69f8739b43792c4ad4b3bc7c768affcf
 Android.mk: 4edc52299860ad9f3820326c7607b1af8abb3cade351fa78b786470b0b1a677c
 AndroidProducts.mk: 2f880ed557f05b832ff1171f1025f108a2e511301ec9c1454a7964e5d24f19e3
 README.md: b90194d0c8cb88f06c70ddd46cfa92a28b11ee252f7d70808e7f07142b17bdc8
-cheetah.mk: 4649c515e2335c43f87314d386c27167c602786aecbafddedc3f8035f85b0bce
+cheetah.mk: 61ccc20c1434884e0872e63aa3d541b68f5829bf2b9d668199831ee4aa4dc02e
 cmds-for-envsetup.sh: 424e39d8f0cd215bd1faf8b299328a2124fc69fa7a5074fb20ca8d8fc6ee869e
 firmware: dir
 firmware/abl.img: d0b5d95ddf50384c2fdfad2fbc54eb925abac46f705d00922f56753367654d10
diff --git a/vendor-specs/google_devices/felix.yml b/vendor-specs/google_devices/felix.yml
index 9fd37e3..32ff565 100644
--- a/vendor-specs/google_devices/felix.yml
+++ b/vendor-specs/google_devices/felix.yml
@@ -3,7 +3,7 @@ Android.mk: c9cdc782549bf3a0a80f971455c89b3ca6e01055f8fbc27cc396c2a5301126f3
 AndroidProducts.mk: 23118a80d381ffddd87f65c4f1f78de4250158c17732aed3e56ab349d000d24c
 README.md: 5f137516511cf5fc7e11bf6d790bed1c93f14dad1f406a54fd4cecbe75989750
 cmds-for-envsetup.sh: 0e68eb1bf4a7a77337b22629b767e7bfeef835e7520ac98288f7be145477f42f
-felix.mk: c9080711e2b4fda789de9778dfeb3abb34b01709bc4fd86ada33fd7fee41915e
+felix.mk: 48eabc3e63cfc05be95068fbbd97c942614ac95286e32b3804042c1f05c78ef8
 firmware: dir
 firmware/abl.img: 051bd05e319ea1991c14a4a7cfb78ce3a06f5091408ba4cdc46caed28659a015
 firmware/android-info.txt: f04fe21203b22e4b7b6050d69f53a3806cb7cf45de6eb92504ef3d80d9736eb9
diff --git a/vendor-specs/google_devices/lynx.yml b/vendor-specs/google_devices/lynx.yml
index c5986d4..6f31552 100644
--- a/vendor-specs/google_devices/lynx.yml
+++ b/vendor-specs/google_devices/lynx.yml
@@ -16,7 +16,7 @@ firmware/modem.img: d8d1ecf9376adbabe612e1f2da427e7f5c0eaa226aae3207511e50af9317
 firmware/pbl.img: 85a0f45bfb0380ecfd442505035d80ac7e4faf4b25703963cee3e6c5a201313d
 firmware/radio.img: 1a2b696874b1adda01bfbea1752a2be89a38ea9afc6df08bdccf03e40d07a088
 firmware/tzsw.img: a2898965fe730bca524c4ab86ea33efbfb6fff492d0b166866b4503b5e717e07
-lynx.mk: b47458ff5cba607d8b753efae0bbec1691798b586b436910f65356769261e619
+lynx.mk: 3a40afc185756455b2eed17afc6bc771bbffe286e7615d0648a83e1f2b4df032
 overlays: dir
 overlays/product.txt: 4dbb00df68ffd49eed165acd40f4accbe7e0d6d45b1a0e8d1ad71703ff9a236f
 overlays/product_android: dir
diff --git a/vendor-specs/google_devices/oriole.yml b/vendor-specs/google_devices/oriole.yml
index 0bc5bcb..7f3e7f3 100644
--- a/vendor-specs/google_devices/oriole.yml
+++ b/vendor-specs/google_devices/oriole.yml
@@ -16,7 +16,7 @@ firmware/modem.img: f800a3dae9b57036c542020a6bd03288032d08a221b17a4479f51b4efe72
 firmware/pbl.img: 5614c452c16bd59606c5d68168cc8416f447ae5170e546de0d0e8e6f8bedda36
 firmware/radio.img: 88730ceaa9edaf25f2c22f091d84aed9bb84b1da09e47be080c49c99a42cec83
 firmware/tzsw.img: 08cd301d915d793b99343a8e6e8435b81064eeae7d19aeb26205e7857fa6cfe6
-oriole.mk: 7f7ec14ff81cd5e270973a9a88ef9ff3866af810de4833b98020b852c09df87c
+oriole.mk: cc90435baba1f8443e579d7c5412c9ab0cdb4abf2e0f41a18caae4fb35f4ce63
 overlays: dir
 overlays/product.txt: e2b247ec25a05eac8aaf10886b357bcb0154c153538331cb39bf7f24127a1e70
 overlays/product_android: dir
diff --git a/vendor-specs/google_devices/panther.yml b/vendor-specs/google_devices/panther.yml
index a15167f..3ce4c54 100644
--- a/vendor-specs/google_devices/panther.yml
+++ b/vendor-specs/google_devices/panther.yml
@@ -73,7 +73,7 @@ overlays/vendor_android/AndroidManifest.xml: f5e124b5b317c5d0bda512f356f774b40c4
 overlays/vendor_android/res: dir
 overlays/vendor_android/res/values: dir
 overlays/vendor_android/res/values/values.xml: 11815719c304cb1a6dd8abdee61d50bee3d5f6c5f4c1a892a14209d1269924b0
-panther.mk: ca6703a0ac6e2ffc768bab1b5c0115270d58bfeccda3942fd0b724063cc47b7d
+panther.mk: 3a01a82f47b1b211b584dc577d81237d8023adfdf12a4c3dba37cd8a7648a9e8
 proprietary: dir
 proprietary-files.txt: 22349d161a1804c422f3a3721eb3e6241270094bd3ae771e2a99fb2a48761604
 proprietary/Android.bp: 792a44e7ee62c4b6389f6d6bc9bcf5723a659f1e7f45fd869061a6708b75c6d5
diff --git a/vendor-specs/google_devices/raven.yml b/vendor-specs/google_devices/raven.yml
index 68634af..f965cb6 100644
--- a/vendor-specs/google_devices/raven.yml
+++ b/vendor-specs/google_devices/raven.yml
@@ -1716,7 +1716,7 @@ proprietary/vendor/lib64/vendor.samsung_slsi.telephony.hardware.radioExternal@1.
 proprietary/vendor/lib64/vendor.samsung_slsi.telephony.hardware.radioExternal@1.1.so: 7fdc55cbc4691ef170a37fbf08cfac8c90f52c2af3f801af461dd304cce556f9
 proprietary/vendor/lib64/vendor_chre_atoms_log.so: 91ea28cd534eac8a34f7e6f0e8f441ed054cb3ab39c54be311b9d6fc159dcb4f
 proprietary/vendor/lib64/vendor_chre_metrics-cpp.so: 20efffd6b506f22b474b682790ca2ef00820073038657d876089b3908da50170
-raven.mk: 7bdd7d94306130e65226ff577b24aa4ede22e9f9d4f3cf0a94909ebe85b89a30
+raven.mk: 3a70b1f83a7a78c7a7f181a588f28fa8700dc6fb46c523bb76165ca70528e7fe
 sepolicy: dir
 vintf: dir
 vintf/adevtool_manifest_vendor.xml: 6e23967b1fe6321c4d8d148b76e5a27a70f520f5e0e63a0dda754bfe72c2a400