refactor: move fix_disable_proxy_trace_events.patch to common patches

instrumentisto · Jul 18, 2024 · a83853c · a83853c
1 parent 7ea040f
commit a83853c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/build/common.mk b/build/common.mk
@@ -35,7 +35,8 @@ common-patch:
 	&& cd $(SRC_DIR) \
 	&& patch -p1 < $(PATCH_DIR)/nacl_armv6_2.patch \
 	&& patch -p2 < $(PATCH_DIR)/add_licenses.patch \
-	&& patch -p2 < $(PATCH_DIR)/4k.patch
+	&& patch -p2 < $(PATCH_DIR)/4k.patch \
+	&& patch -p2 < $(PATCH_DIR)/fix_disable_proxy_trace_events.patch
 
 .PHONY: common-package
 common-package: copy

diff --git a/build/macos-arm64/Makefile b/build/macos-arm64/Makefile
@@ -48,8 +48,7 @@ copy: common-copy
 .PHONY: patch
 patch: common-patch
 	cd $(SRC_DIR) && \
-	patch -p2 < $(PATCH_DIR)/add_yuv_helper_ios_mac.patch && \
-	patch -p2 < $(PATCH_DIR)/fix_disable_proxy_trace_events.patch
+	patch -p2 < $(PATCH_DIR)/add_yuv_helper_ios_mac.patch
 
 .PHONY: build
 build: patch

diff --git a/build/macos-x64/Makefile b/build/macos-x64/Makefile
@@ -48,8 +48,7 @@ copy: common-copy
 .PHONY: patch
 patch: common-patch
 	cd $(SRC_DIR) && \
-	patch -p2 < $(PATCH_DIR)/add_yuv_helper_ios_mac.patch && \
-	patch -p2 < $(PATCH_DIR)/fix_disable_proxy_trace_events.patch
+	patch -p2 < $(PATCH_DIR)/add_yuv_helper_ios_mac.patch
 
 .PHONY: build
 build: patch