From cdc32dc8b4c7ab00c33739d7b4d8f7622533cbe4 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Tue, 27 Jul 2021 13:02:00 +1000
Subject: [PATCH] Swap to gzip.

---
 build_keyboard.mk          | 15 +++++++--------
 quantum/xap/xap_handlers.c |  1 +
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build_keyboard.mk b/build_keyboard.mk
index 9317c52328a3..7dd5d8075313 100644
--- a/build_keyboard.mk
+++ b/build_keyboard.mk
@@ -356,15 +356,14 @@ include common_features.mk
 # XAP embedded info.json
 ifeq ($(strip $(XAP_ENABLE)), yes)
 
-$(KEYMAP_OUTPUT)/src/info_json_xz.h: $(INFO_JSON_FILES)
+$(KEYMAP_OUTPUT)/src/info_json_gz.h: $(INFO_JSON_FILES)
 	mkdir -p $(KEYMAP_OUTPUT)/src
-	cat $(INFO_JSON_FILES) | xz -cz9e - > $(KEYMAP_OUTPUT)/src/info.json.xz
-	cd $(KEYMAP_OUTPUT)/src \
-		&& xxd -i info.json.xz info_json_xz.h \
-		&& cd -
+	cat $(INFO_JSON_FILES) | gzip -c9 > $(KEYMAP_OUTPUT)/src/info.json.gz
+	cd $(KEYMAP_OUTPUT)/src >/dev/null 2>&1 \
+		&& xxd -i info.json.gz info_json_gz.h \
+		&& cd - >/dev/null 2>&1
 
-XAP_FILES = $(shell ls -1 data/xap/* | sort | xargs echo)
-$(info $(XAP_FILES))
+XAP_FILES := $(shell ls -1 data/xap/* | sort | xargs echo)
 
 $(KEYMAP_OUTPUT)/src/xap_generated.inl: $(XAP_FILES)
 	$(QMK_BIN) xap-generate-qmk-inc -o "$(KEYMAP_OUTPUT)/src/xap_generated.inl"
@@ -372,7 +371,7 @@ $(KEYMAP_OUTPUT)/src/xap_generated.inl: $(XAP_FILES)
 $(KEYMAP_OUTPUT)/src/xap_generated.h: $(XAP_FILES)
 	$(QMK_BIN) xap-generate-qmk-h -o "$(KEYMAP_OUTPUT)/src/xap_generated.h"
 
-generated-files: $(KEYMAP_OUTPUT)/src/info_json_xz.h $(KEYMAP_OUTPUT)/src/xap_generated.inl $(KEYMAP_OUTPUT)/src/xap_generated.h
+generated-files: $(KEYMAP_OUTPUT)/src/info_json_gz.h $(KEYMAP_OUTPUT)/src/xap_generated.inl $(KEYMAP_OUTPUT)/src/xap_generated.h
 
 VPATH += $(KEYMAP_OUTPUT)/src
 endif
diff --git a/quantum/xap/xap_handlers.c b/quantum/xap/xap_handlers.c
index 824845decc75..5d08ebbede87 100755
--- a/quantum/xap/xap_handlers.c
+++ b/quantum/xap/xap_handlers.c
@@ -16,6 +16,7 @@
 
 #include <quantum.h>
 #include <xap.h>
+#include <info_json_gz.h>
 
 void xap_respond_failure(xap_token_t token, xap_response_flags_t response_flags) { xap_send(token, response_flags, NULL, 0); }