From e2ef1cfb87935e3fb8c471206eabb40b8a26750e Mon Sep 17 00:00:00 2001 From: Zenichi Amano Date: Mon, 5 Aug 2024 13:35:39 +0900 Subject: [PATCH] =?UTF-8?q?fix:=20perfetto=E3=82=92=E7=84=A1=E5=8A=B9?= =?UTF-8?q?=E3=81=AB=E3=81=99=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Zenichi Amano --- build.windows.ps1 | 8 ++++---- build/android/Makefile | 11 ++++++----- build/ios/Makefile | 8 +++++--- build/linux-arm/Makefile | 9 +++++---- build/linux-arm64/Makefile | 11 ++++++----- build/linux-x64/Makefile | 11 ++++++----- build/macos-arm64/Makefile | 15 ++++++++------- build/macos-x64/Makefile | 9 +++++---- 8 files changed, 45 insertions(+), 37 deletions(-) diff --git a/build.windows.ps1 b/build.windows.ps1 index 9ee4b717..359de398 100644 --- a/build.windows.ps1 +++ b/build.windows.ps1 @@ -91,19 +91,19 @@ Get-PSDrive Push-Location $WEBRTC_DIR\src # WebRTC Debugビルド x64 - gn gen $BUILD_DIR\debug_x64 --args='is_debug=true treat_warnings_as_errors=false rtc_use_h264=false rtc_include_tests=false rtc_build_tools=false rtc_build_examples=false is_component_build=false use_rtti=true use_custom_libcxx=false' + gn gen $BUILD_DIR\debug_x64 --args='is_debug=true treat_warnings_as_errors=false rtc_use_h264=false rtc_include_tests=false rtc_build_tools=false rtc_build_examples=false rtc_use_perfetto=false is_component_build=false use_rtti=true use_custom_libcxx=false' ninja -C "$BUILD_DIR\debug_x64" # WebRTC Releaseビルド x64 - gn gen $BUILD_DIR\release_x64 --args='is_debug=false treat_warnings_as_errors=false rtc_use_h264=false rtc_include_tests=false rtc_build_tools=false rtc_build_examples=false is_component_build=false use_rtti=true strip_debug_info=true symbol_level=0 use_custom_libcxx=false' + gn gen $BUILD_DIR\release_x64 --args='is_debug=false treat_warnings_as_errors=false rtc_use_h264=false rtc_include_tests=false rtc_build_tools=false rtc_build_examples=false rtc_use_perfetto=false is_component_build=false use_rtti=true strip_debug_info=true symbol_level=0 use_custom_libcxx=false' ninja -C "$BUILD_DIR\release_x64" # WebRTC Debugビルド x86 - gn gen $BUILD_DIR\debug_x86 --args='target_os=\"win\" target_cpu=\"x86\" is_debug=true treat_warnings_as_errors=false rtc_use_h264=false rtc_include_tests=false rtc_build_tools=false rtc_build_examples=false is_component_build=false use_rtti=true use_custom_libcxx=false' + gn gen $BUILD_DIR\debug_x86 --args='target_os=\"win\" target_cpu=\"x86\" is_debug=true treat_warnings_as_errors=false rtc_use_h264=false rtc_include_tests=false rtc_build_tools=false rtc_build_examples=false rtc_use_perfetto=false is_component_build=false use_rtti=true use_custom_libcxx=false' ninja -C "$BUILD_DIR\debug_x86" # WebRTC Releaseビルド x86 - gn gen $BUILD_DIR\release_x86 --args='target_os=\"win\" target_cpu=\"x86\" is_debug=false treat_warnings_as_errors=false rtc_use_h264=false rtc_include_tests=false rtc_build_tools=false rtc_build_examples=false is_component_build=false use_rtti=true strip_debug_info=true symbol_level=0 use_custom_libcxx=false' + gn gen $BUILD_DIR\release_x86 --args='target_os=\"win\" target_cpu=\"x86\" is_debug=false treat_warnings_as_errors=false rtc_use_h264=false rtc_include_tests=false rtc_build_tools=false rtc_build_examples=false rtc_use_perfetto=false is_component_build=false use_rtti=true strip_debug_info=true symbol_level=0 use_custom_libcxx=false' ninja -C "$BUILD_DIR\release_x86" Pop-Location diff --git a/build/android/Makefile b/build/android/Makefile index 6df81178..2b976ebc 100644 --- a/build/android/Makefile +++ b/build/android/Makefile @@ -12,14 +12,15 @@ include ../common.mk EXTRA_GN_ARGS := \ is_debug=false \ is_java_debug=false \ - $(RTC_USE_H264) \ - rtc_build_tools=false \ - rtc_build_examples=false \ - rtc_include_tests=false \ is_clang=true \ is_component_build=false \ - rtc_enable_protobuf=false \ + $(RTC_USE_H264) \ + rtc_build_examples=false \ rtc_build_json=true \ + rtc_build_tools=false \ + rtc_enable_protobuf=false \ + rtc_include_tests=false \ + rtc_use_perfetto=false \ use_rtti=true .PHONY: all diff --git a/build/ios/Makefile b/build/ios/Makefile index d5a0c961..9864688f 100644 --- a/build/ios/Makefile +++ b/build/ios/Makefile @@ -10,12 +10,14 @@ TARGET_CPU = include ../common.mk EXTRA_GN_ARGS := \ - use_rtti=true \ + is_debug=false + $(RTC_USE_H264) \ rtc_libvpx_build_vp9=true \ rtc_include_tests=false \ - rtc_build_tools=false \ rtc_build_examples=false \ - rtc_use_h264=false + rtc_build_tools=false \ + rtc_use_perfetto=false \ + use_rtti=true .PHONY: all all: clean build package diff --git a/build/linux-arm/Makefile b/build/linux-arm/Makefile index 1eb5af8b..fcb574e1 100644 --- a/build/linux-arm/Makefile +++ b/build/linux-arm/Makefile @@ -16,13 +16,14 @@ EXTRA_GN_ARGS := \ $(RTC_USE_H264) \ $(RTC_USE_X11) \ rtc_include_tests=false \ - rtc_build_tools=false \ rtc_build_examples=false \ - rtc_use_pipewire=false \ rtc_build_json=true \ - use_rtti=true \ + rtc_build_tools=false \ + rtc_use_perfetto=false \ + rtc_use_pipewire=false \ use_custom_libcxx=false \ - use_custom_libcxx_for_host=false + use_custom_libcxx_for_host=false \ + use_rtti=true .PHONY: all all: clean build package diff --git a/build/linux-arm64/Makefile b/build/linux-arm64/Makefile index 49e86c1a..d6503cd4 100644 --- a/build/linux-arm64/Makefile +++ b/build/linux-arm64/Makefile @@ -15,14 +15,15 @@ EXTRA_GN_ARGS := \ is_debug=false \ $(RTC_USE_H264) \ $(RTC_USE_X11) \ - rtc_include_tests=false \ - rtc_build_tools=false \ rtc_build_examples=false \ - rtc_use_pipewire=false \ rtc_build_json=true \ - use_rtti=true \ + rtc_build_tools=false \ + rtc_include_tests=false \ + rtc_use_perfetto=false \ + rtc_use_pipewire=false \ use_custom_libcxx=false \ - use_custom_libcxx_for_host=false + use_custom_libcxx_for_host=false \ + use_rtti=true .PHONY: all all: clean build package diff --git a/build/linux-x64/Makefile b/build/linux-x64/Makefile index bae3ce1b..7784d02c 100644 --- a/build/linux-x64/Makefile +++ b/build/linux-x64/Makefile @@ -15,14 +15,15 @@ EXTRA_GN_ARGS := \ is_debug=false \ $(RTC_USE_H264) \ $(RTC_USE_X11) \ - rtc_include_tests=false \ - rtc_build_tools=false \ rtc_build_examples=false \ - rtc_use_pipewire=false \ rtc_build_json=true \ - use_rtti=true \ + rtc_build_tools=false \ + rtc_include_tests=false \ + rtc_use_perfetto=false \ + rtc_use_pipewire=false \ use_custom_libcxx=false \ - use_custom_libcxx_for_host=false + use_custom_libcxx_for_host=false \ + use_rtti=true .PHONY: all all: clean build package diff --git a/build/macos-arm64/Makefile b/build/macos-arm64/Makefile index 0d4ffc8d..5f7d9930 100644 --- a/build/macos-arm64/Makefile +++ b/build/macos-arm64/Makefile @@ -15,18 +15,19 @@ EXTRA_GN_ARGS := \ enable_stripping=true \ enable_dsyms=true \ is_debug=false \ + is_component_build=false \ treat_warnings_as_errors=false \ $(RTC_USE_H264) \ - rtc_include_tests=false \ - rtc_build_tools=false \ rtc_build_examples=false \ - rtc_libvpx_build_vp9=true \ - rtc_enable_symbol_export=true \ + rtc_build_tools=false \ rtc_enable_objc_symbol_export=true \ - is_component_build=false \ - use_rtti=true \ + rtc_enable_symbol_export=true \ + rtc_include_tests=false \ + rtc_libvpx_build_vp9=true \ + rtc_use_perfetto=false \ use_custom_libcxx=false \ - use_custom_libcxx_for_host=false + use_custom_libcxx_for_host=false \ + use_rtti=true .PHONY: all all: clean build package diff --git a/build/macos-x64/Makefile b/build/macos-x64/Makefile index 0786b6d5..303ecb6b 100644 --- a/build/macos-x64/Makefile +++ b/build/macos-x64/Makefile @@ -15,18 +15,19 @@ EXTRA_GN_ARGS := \ enable_stripping=true \ enable_dsyms=true \ is_debug=false \ + is_component_build=false \ treat_warnings_as_errors=false \ $(RTC_USE_H264) \ rtc_include_tests=false \ rtc_build_tools=false \ rtc_build_examples=false \ - rtc_libvpx_build_vp9=true \ rtc_enable_symbol_export=true \ rtc_enable_objc_symbol_export=true \ - is_component_build=false \ - use_rtti=true \ + rtc_libvpx_build_vp9=true \ + rtc_use_perfetto=false \ use_custom_libcxx=false \ - use_custom_libcxx_for_host=false + use_custom_libcxx_for_host=false \ + use_rtti=true .PHONY: all all: clean build package