From a83853ca03ca00956ae6054dd19b308a863dbfc5 Mon Sep 17 00:00:00 2001 From: evdokimovs Date: Thu, 18 Jul 2024 11:41:46 +0200 Subject: [PATCH] refactor: move `fix_disable_proxy_trace_events.patch` to common patches --- build/common.mk | 3 ++- build/macos-arm64/Makefile | 3 +-- build/macos-x64/Makefile | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build/common.mk b/build/common.mk index 348a78fd..0ba347cf 100644 --- 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 index 56dcf3b9..487b472e 100644 --- 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 index a046dcb5..4dfc61f9 100644 --- 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