Skip to content
Merged
Show file tree
Hide file tree
Changes from 124 commits
Commits
Show all changes
125 commits
Select commit Hold shift + click to select a range
aef7de4
[MSan] "Fix" use-after-dtor in InitializationState.InitializationState
zetafunction Jul 17, 2024
d380daf
Update cpp-httplib to 6a848b1a1643
markmentovai Jul 31, 2024
9b3ff69
Upgrade simulator tests to iPhone 15 running iOS 17.4
strangewiz Aug 1, 2024
b8658f3
Use Python shlex instead of the deprecated pipes
markmentovai Aug 6, 2024
1a62a01
BoringSSL compatibility fixes for cpp-httplib
markmentovai Aug 7, 2024
6159a43
Update cpp-httplib to c5c54b31e2bf (0.16.2)
markmentovai Aug 8, 2024
ee8369f
Roll crashpad/third_party/mini_chromium/mini_chromium/ bd56f6933..7ec…
pbos Aug 13, 2024
cc54fcc
Fix trailing NOTREACHED_NORETURN()
pbos Aug 14, 2024
6265674
Migrate to NOTREACHED()
pbos Aug 14, 2024
adb22c8
Switch from `ALIGNAS()` to `alignas()`.
pkasting Aug 22, 2024
458bdec
Don't redefine macros from base/compiler_specific.h.
pkasting Aug 22, 2024
7566378
Roll crashpad/third_party/mini_chromium/mini_chromium/ 7eca85315..e04…
pkasting Aug 22, 2024
50faaf1
Revert "Don't redefine macros from base/compiler_specific.h."
markmentovai Aug 22, 2024
f9fa2d1
[reland] Don't redefine macros from base/compiler_specific.h.
pkasting Aug 28, 2024
915913b
Fix crashpad for PGO generation
Sep 3, 2024
35e06fe
Add Revision to xnu’s README.crashpad
markmentovai Sep 9, 2024
e3abe1e
[fuchsia] remove unnecessary build args
zijiehe-google-com Sep 11, 2024
6d37f81
ios: Remove OS filter for iOS simulator tests.
strangewiz Sep 11, 2024
b39cca1
[DEPS] Rely on buildtools recursedep to fetch clang-format
sokcevicG May 30, 2024
030fdeb
Roll crashpad/third_party/mini_chromium/mini_chromium/ e04c707cb..c08…
pbos Oct 4, 2024
032bcc9
Mark CrashWithoutDumping() as [[noreturn]]
nico Oct 2, 2024
1f24e58
Make the network use proxy settings by default for Windows
hurims Oct 11, 2024
e05f665
Roll cpp-httplib
pbos Oct 15, 2024
41c74f5
[fuchsia] Remove duplicate LogSink routes
gbbosak Oct 17, 2024
70ccb76
Accept longer Settings::Data structs
pbos Oct 21, 2024
6c57c08
Fix -Wsign-compare in CrashReportDatabaseTest
pbos Oct 22, 2024
b8937c6
tools: fix missing include for EXIT_{SUCCESS,FAILURE}
Oct 28, 2024
02d094f
win: IWYU for __argc, __wargv
nico Nov 5, 2024
65a4501
Replace CHECK(false) instances
pbos Nov 13, 2024
3b0a429
Fix #includes
markmentovai Nov 14, 2024
3f1b841
win: Include stddef.h for offsetof()
nico Nov 25, 2024
66a7812
Add .vscode to .gitignore
jessemckenna Nov 26, 2024
4826f5a
Roll crashpad/third_party/mini_chromium/mini_chromium/ c081fd005..630…
pkasting Dec 12, 2024
6419a2e
Make use of `base::fixed_extent<>`.
pkasting Dec 12, 2024
a0025ad
Roll crashpad/third_party/mini_chromium/mini_chromium/ 63057a19a..22f…
speednoisemovement Dec 17, 2024
c6d912d
Add STARTF_FORCEOFFFEEDBACK to prevent busy cursor on process launch
Jan 14, 2025
0e548cc
OWN Crashpad
markmentovai Jan 21, 2025
1e81dd5
crashpad: fix missing . when appending crash report extension
sorinj Jan 17, 2025
e428b3a
doc: Update to Doxygen 1.13.2, fix Doxygen warnings, modernize somewhat
markmentovai Jan 23, 2025
9e8334f
Always pull clang on Windows
nico Jan 29, 2025
04bcaa9
remove set noparent from OWNERS file
sorinj Jan 29, 2025
312919d
Remove traces of third_party/gyp
pbos Jan 14, 2025
4a227b2
Add a newline to scoped_registry_key.h
nico Feb 10, 2025
85ecbd2
Fix SyntaxWarning in build/run_tests.py
markmentovai Feb 11, 2025
db25cdc
Remove a NOTREACHED() after a __builtin_trap()
nico Feb 24, 2025
d7aeda9
Prepare for building with clang
nico Feb 24, 2025
73b3e4f
Enable clang by default on Windows
nico Feb 24, 2025
e2acb9f
Fix iOS test when run on arm64 under x86_64 translation
strangewiz Feb 24, 2025
0945d59
Update cpp-httplib to 71ba7e7b1b32 (0.19.0 + 22 commits)
markmentovai Feb 24, 2025
4d14c1b
Simplify ChromeOS build configuration
GeorgNeis Feb 17, 2025
51eba29
Fix Python 3.13 re DeprecationWarning: pass count and flags by keyword
markmentovai Feb 25, 2025
29dc41f
Update mini_chromium to aa56c39732fe3056cc342e59f1a5563ed6ba5e5e
markmentovai Feb 26, 2025
7d350d7
Remove BUG_PREFIX from codereview.settings
markmentovai Feb 27, 2025
a470103
Update mini_chromium to af17e4df94cfff4b6fa9f0be3eb222828b7cbce6
markmentovai Feb 27, 2025
32a2c25
zlib: don’t define __clang__ for win-arm64 with MSVC
markmentovai Feb 27, 2025
8eb8015
Fix capture_context_win_arm64 in standalone clang build
markmentovai Feb 27, 2025
e383fa1
.gitignore third_party/windows/clang/win-amd64
markmentovai Feb 27, 2025
04b11f9
Remove nullptr initialization of std::string
Prabhuk Mar 7, 2025
e09f5ee
ios: Support UserStreamDataSources on iOS.
strangewiz Mar 12, 2025
342bd4d
ios: Enable extra_memory_ranges on iOS.
strangewiz Mar 11, 2025
c405b3e
ios: Support intermediate dump extra_memory_ranges.
strangewiz Mar 14, 2025
3eba16f
ios: Correct bad dep
strangewiz Mar 14, 2025
cfe842c
ios: Add more tests for extra_memory_ranges and custom user streams.
strangewiz Mar 17, 2025
21a20ef
[fuchsia] Route diagnostics dictionary to Chromium
zijiehe-google-com Mar 24, 2025
279de5e
Update mini_chromium to 7477036e238e54f220bed206f71036db8064dd34
rakuco Mar 25, 2025
421b4a9
Revert "[fuchsia] Route diagnostics dictionary to Chromium"
gbbosak Mar 25, 2025
a5ef986
[iOS] Clean up some includes in client/ and snapshot/
rakuco Mar 26, 2025
eefaa42
build: Add a crashpad_is_tvos GN variable
rakuco Apr 1, 2025
0ddebd9
build: Add tvOS support to setup_ios_gn.py
rakuco Apr 1, 2025
1feae80
Thread: Make GetThreadIdForTesting() static
rakuco Apr 1, 2025
e572921
util: Only build spawn_subprocess.{cc,h} on Linux and Mac
rakuco Apr 1, 2025
d4cf4d4
cptest_application_delegate.mm: Restrict keyWindow usage on tvOS too
rakuco Apr 1, 2025
b833131
Update mini_chromium to 15d1cace45803c0efb2a43630bf48bcdc15ad9e8
ilovepi Apr 2, 2025
ea312c6
Rename SetMachExceptionCallbackForTesting() to SetExceptionCallbackFo…
rakuco Apr 2, 2025
e00f8d2
Update Fuchsia toolchain pin to use `integration`
ilovepi Apr 3, 2025
cb2d00c
[ios] Remove unused #include in exception_processor.mm
bhamiltoncx Apr 4, 2025
27a5c6c
ios: Disable annotations tests on older simulators on macOS 15.4
strangewiz Apr 4, 2025
fc35662
ios: Fix compile for EDO with Xcode 16.3
strangewiz Apr 4, 2025
8d6cc37
[client] Add include-what-you-use pragmas to simulate_crash facade
bhamiltoncx Apr 4, 2025
ef2a4d8
Mac: ensure crashes are forwarded to system crash reporter
speednoisemovement Apr 8, 2025
3bc11fd
android: Fix spawn_subprocess build.
strangewiz Apr 10, 2025
b5ac75e
third_party/ninja: Fix license header
Jwata Apr 21, 2025
8082d90
[fuchsia] Fix Crashpad tests license
pankhurstG Apr 18, 2025
e8b8e90
Correct third_party/edo header to proper form for Crashpad.
strangewiz Apr 22, 2025
d6ed84b
DEPS: roll mini_chromium
Apr 24, 2025
cfba58c
Roll crashpad/third_party/edo/edo/ 727e55670..38e71ff18 (48 commits)
strangewiz Apr 30, 2025
59af475
ios: Restore SIGPIPE handler in CrashHandler's destructor
rakuco May 13, 2025
73eb900
[fuchsia] Uprev test-scripts with FUCHSIA_READELF env
strangewiz May 13, 2025
aed4e5d
client: Add a tvOS version of CrashHandler, add tvOS support to tests
rakuco May 13, 2025
8bbfddf
run_tests.py: Add support for tvOS
rakuco Apr 11, 2025
ecd1431
ios_system_data_collector: Do not monitor orientation changes on tvOS
rakuco Apr 11, 2025
405ab8e
Add missing include to crashpad.
matts1 Mar 17, 2025
19a1004
run_tests.py: Fix style after 8bbfddf3
rakuco May 15, 2025
8f13101
tvOS: Remove LOG() call from CrashHandler::DoInitialize()
rakuco May 15, 2025
0a66227
build: Propagate data_deps of crashpad_tests for Android build
Jwata May 22, 2025
877188c
[fuchsia] Log status on error for ZX_PROP_PROCESS_DEBUG_ADDR
thomasgales May 21, 2025
d5dc6d8
Roll crashpad/third_party/mini_chromium/mini_chromium/ 361ef33dc..4e7…
May 28, 2025
26ad443
Add test filter upstream in Crashpad
May 28, 2025
46a5690
Fix Fuchsia build
thomasgales May 29, 2025
576a639
tvOS: Document differences from iOS
rakuco Jul 9, 2025
306647a
Update googletest to fix fuchsia
zijiehe-google-com Jul 11, 2025
0574023
Crashpad: AnnotationList: Spell check a random word in annotation_list.h
solomonkinardchromium Jul 10, 2025
37b3418
return a bool from LogOutputStream::Delegate::Log
Jul 25, 2025
d72c577
Increase delay in crashpad_util_test ServiceManagement.SubmitRemoveJob
markmentovai Jul 28, 2025
7292c84
Fix crashpad_snapshot_test ProcessReaderMac.* for macOS ≥ 15.4
markmentovai Jul 28, 2025
9839095
Run gn format on BUILD.gn files
Jul 25, 2025
e179c70
util: Simplify MacOSVersionNumber
markmentovai Jul 29, 2025
d100afd
util: DO an arm64 TODO in MacModelAndBoard
markmentovai Jul 29, 2025
c59265d
infra: add mac-arm64 bots
markmentovai Jul 30, 2025
bb69421
snapshot: prepare MachOImageAnnotationsReader for macOS/iOS 26
markmentovai Jul 30, 2025
8921413
iOS: Explicitly ignore return value of vector::at()
nico Aug 1, 2025
811b042
ios: Handle dyld crashreporter_annotations_t in __DATA_DIRTY segment.
strangewiz Jul 31, 2025
ace1350
Convert base::StringPiece to std::string_view
Aug 15, 2025
3472da6
Migrate to __system_property_read_callback()
Aug 19, 2025
9eb9135
Fix Fuchsia build
thomasgales Aug 18, 2025
64c8551
Update cpp-httplib to 3f44c80fd345 (0.25.0)
markmentovai Aug 20, 2025
ad8e3e9
[gtest] Clean up single-arg `testing::Invoke()`s
jonathan-j-lee Sep 18, 2025
2060cc8
Rename third_party/linux/README.crashpad to .md
Sep 23, 2025
b9d38f3
crashpad: Introduce a new SettingsReader type for read-only access
Oct 10, 2025
578db64
rate-limit: create ShouldRateLimit() and tests
jessemckenna Oct 17, 2025
94e4459
Inline kBackwardsClockTolerance in header
jessemckenna Oct 18, 2025
7ab18af
clang-tidy: concatenate nested namespaces
jessemckenna Oct 21, 2025
7833ced
Merge branch 'main' of https://chromium.googlesource.com/crashpad/cra…
JoshuaMoelans Oct 22, 2025
cc7d58a
Adapt build scripts to upstream changes + fixes
JoshuaMoelans Oct 22, 2025
2e4a7b8
point mini_chromium submodule to getsentry branch
JoshuaMoelans Oct 23, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
*.gn text eol=lf
*.gni text eol=lf
*.go text eol=lf
*.gyp text eol=lf
*.gypi text eol=lf
*.h text eol=lf
*.m text eol=lf
*.md text eol=lf
Expand Down
10 changes: 8 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
.cache
.gdb_history
.gdbinit
/.vscode/
/Makefile
/build/fuchsia
/out
Expand All @@ -35,11 +36,16 @@
/third_party/fuchsia/qemu
/third_party/fuchsia/sdk
/third_party/googletest/googletest
/third_party/gyp/gyp
/third_party/libfuzzer
/third_party/linux/.cipd
/third_party/linux/clang
/third_party/linux/sysroot
/third_party/gyp/gyp
/third_party/lss/lss
/third_party/mini_chromium/mini_chromium
/third_party/ninja/linux
/third_party/ninja/mac*
/third_party/ninja/ninja.exe
/third_party/windows/clang/win-amd64
/third_party/zlib/zlib
/xcodebuild
tags
18 changes: 18 additions & 0 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,37 @@ if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
"test:test_test",
"util:util_test",
]

data_deps = []

if (crashpad_is_in_chromium) {
data_deps += [ "//testing/buildbot/filters:crashpad_tests_filters" ]
}

if (!crashpad_is_ios && !crashpad_is_fuchsia) {
deps += [ "handler:handler_test" ]
}
if (crashpad_is_in_fuchsia) {
# TODO(fuchsia:46559): Fix the leaks and remove this.
deps += [ "//build/config/sanitizers:suppress-lsan.DO-NOT-USE-THIS" ]

# TODO(fxbug.dev/42059784): Remove this once the underlying issue is
# addressed.
exclude_toolchain_tags = [ "hwasan" ]
}
if (crashpad_is_android) {
use_raw_android_executable = true

# crbug.com/418874703 - This is a workaround to propagate the data deps to
# //:crashpad_tests__dist for Android build.
data_deps += [
"snapshot:crashpad_snapshot_test_both_dt_hash_styles",
"snapshot:crashpad_snapshot_test_module",
"snapshot:crashpad_snapshot_test_module_large",
"snapshot:crashpad_snapshot_test_module_small",
"test:crashpad_test_test_multiprocess_exec_test_child",
]

copy("crashpad_test_data") {
testonly = true
sources = [
Expand Down
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,7 @@ if(MSVC)
$<$<AND:$<COMPILE_LANGUAGE:C,CXX>,$<C_COMPILER_ID:Clang>>:-Wno-deprecated-declarations> # same as /wd4996
$<$<AND:$<COMPILE_LANGUAGE:C,CXX>,$<C_COMPILER_ID:Clang>>:-Wno-format> # only Clang-CL
$<$<AND:$<COMPILE_LANGUAGE:C,CXX>,$<C_COMPILER_ID:Clang>>:-Wno-cast-function-type-mismatch> # only Clang-CL
$<$<AND:$<COMPILE_LANGUAGE:C,CXX>,$<C_COMPILER_ID:Clang>>:-Wno-return-type>
)
elseif(MINGW)
# redirect to wmain
Expand All @@ -143,6 +144,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_compile_options(crashpad_interface INTERFACE
$<$<COMPILE_LANGUAGE:CXX>:-Wno-multichar>
$<$<COMPILE_LANGUAGE:CXX>:-Wno-attributes>
$<$<COMPILE_LANGUAGE:CXX>:-Wno-return-type>
)
endif()

Expand Down
66 changes: 19 additions & 47 deletions DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -29,25 +29,25 @@ vars = {
deps = {
'buildtools':
Var('chromium_git') + '/chromium/src/buildtools.git@' +
'8919328651a559f8a974641d40fe712062cc6718',
'efa920ce144e4dc1c1841e73179cd7e23b9f0d5e',
'buildtools/clang_format/script':
Var('chromium_git') +
'/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@' +
'c912837e0d82b5ca4b6e790b573b3956d3744c1c',
'crashpad/third_party/edo/edo': {
'url': Var('chromium_git') + '/external/github.com/google/eDistantObject.git@' +
'727e556705278598fce683522beedbb9946bfda0',
'38e71ff183d76f702db6966fa7236c98831acd80',
'condition': 'checkout_ios',
},
'crashpad/third_party/googletest/googletest':
Var('chromium_git') + '/external/github.com/google/googletest@' +
'af29db7ec28d6df1c7f0f745186884091e602e07',
'3983f67e32fb3e9294487b9d4f9586efa6e5d088',
'crashpad/third_party/lss/lss':
Var('chromium_git') + '/linux-syscall-support.git@' +
'9719c1e1e676814c456b55f5f070eabad6709d31',
'crashpad/third_party/mini_chromium/mini_chromium':
Var('chromium_git') + '/chromium/mini_chromium@' +
'bd56f6933f2fa021a44766ced638a18f477ef1c1',
'eef885b0bb80dab8e9d79b9dc0c050a1c8e50c0b',
'crashpad/third_party/libfuzzer/src':
Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git@' +
'fda403cf93ecb8792cb1d061564d89a6553ca020',
Expand Down Expand Up @@ -110,7 +110,7 @@ deps = {
'packages': [
{
'package': 'fuchsia/third_party/clang/mac-amd64',
'version': 'latest',
'version': 'integration',
},
],
'condition': 'checkout_fuchsia and host_os == "mac"',
Expand All @@ -120,12 +120,25 @@ deps = {
'packages': [
{
'package': 'fuchsia/third_party/clang/linux-amd64',
'version': 'latest',
'version': 'integration',
},
],
'condition': 'checkout_fuchsia and host_os == "linux"',
'dep_type': 'cipd'
},
'crashpad/third_party/windows/clang/win-amd64': {
'bucket': 'chromium-browser-clang',
'objects': [
{
'object_name': 'Win/clang-llvmorg-20-init-17108-g29ed6000-2.tar.xz',
'sha256sum': '1c71efd923a91480480d4f31c2fd5f1369e01e14f15776a9454abbce0bc13548',
'size_bytes': 46357580,
'generation': 1737590897363452,
},
],
'condition': 'checkout_win and host_os == "win"',
'dep_type': 'gcs',
},
'crashpad/third_party/fuchsia-gn-sdk': {
'packages': [
{
Expand Down Expand Up @@ -208,47 +221,6 @@ deps = {
}

hooks = [
{
'name': 'clang_format_mac',
'pattern': '.',
'condition': 'host_os == "mac"',
'action': [
'download_from_google_storage',
'--no_resume',
'--no_auth',
'--bucket=chromium-clang-format',
'--sha1_file',
'buildtools/mac/clang-format.{host_cpu}.sha1',
'--output',
'buildtools/mac/clang-format',
],
},
{
'name': 'clang_format_linux',
'pattern': '.',
'condition': 'host_os == "linux"',
'action': [
'download_from_google_storage',
'--no_resume',
'--no_auth',
'--bucket=chromium-clang-format',
'--sha1_file',
'buildtools/linux64/clang-format.sha1',
],
},
{
'name': 'clang_format_win',
'pattern': '.',
'condition': 'host_os == "win"',
'action': [
'download_from_google_storage',
'--no_resume',
'--no_auth',
'--bucket=chromium-clang-format',
'--sha1_file',
'buildtools/win/clang-format.exe.sha1',
],
},
{
# If using a local clang ("pull_linux_clang" above), also pull down a
# sysroot.
Expand Down
20 changes: 20 additions & 0 deletions OWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Copyright 2025 The Crashpad Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
[email protected]
30 changes: 0 additions & 30 deletions build/config/fuchsia/gn_configs.gni
Original file line number Diff line number Diff line change
Expand Up @@ -20,36 +20,6 @@
# rules to reference the contents of the fuchsia SDK.
fuchsia_sdk = "//third_party/fuchsia/sdk/linux-amd64"

# ID uniquely identifying the Fuchsia IDK build. This is exposed as a
# property so it can be used to locate images and packages on GCS and
# as a marker to indicate the "version" of the IDK.
# Defaults to the id found in the manifest.json file of the SDK.
fuchsia_sdk_id = ""

# The target API level for this repository. Embedders should override this
# value to specify the API level the packages produced from this repository
# should be targeting, e.g. in their top-level //.gn file. A value of -1
# means that no API level will be passed to the tools that consumes it.
fuchsia_target_api_level = 18

# The SDK manifest file. This is useful to include as a dependency
# for some targets in order to cause a rebuild when the version of the
# SDK is changed.
fuchsia_sdk_manifest_file = "${fuchsia_sdk}/meta/manifest.json"

# fuchsia_tool_dir is used to specify the directory in the SDK to locate
# tools for the host cpu architecture. If the host_cpu is not recognized,
# then tool dir defaults to x64.
fuchsia_tool_dir = "${fuchsia_sdk}/tools/${host_cpu}"

if (fuchsia_sdk_id == "") {
# Note: If we need to expose more than just the id in the future,
# we should consider exposing the entire json object for the metadata vs.
# adding a bunch of variables.
_meta = read_file(fuchsia_sdk_manifest_file, "json")
fuchsia_sdk_id = _meta.id
}

declare_args() {
# Specify a readelf_exec path to use. If not specified, the host's system
# executable will be used. Passed to populate_build_id_dir.py and
Expand Down
12 changes: 12 additions & 0 deletions build/crashpad_buildconfig.gni
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,14 @@ if (crashpad_is_external || crashpad_is_in_dart) {
}

if (crashpad_is_in_chromium) {
if (is_ios) {
# For `target_platform`.
import("//build/config/apple/mobile_config.gni")
}

crashpad_is_mac = is_mac
crashpad_is_ios = is_ios
crashpad_is_tvos = is_ios && target_platform == "tvos"
crashpad_is_apple = is_apple
crashpad_is_win = is_win
crashpad_is_linux = is_linux || is_chromeos
Expand All @@ -72,8 +78,14 @@ if (crashpad_is_in_chromium) {
import("$mini_chromium_import_root/build/compiler.gni")
import("$mini_chromium_import_root/build/platform.gni")

if (mini_chromium_is_ios) {
# For `target_platform`.
import("$mini_chromium_import_root/build/ios/ios_sdk.gni")
}

crashpad_is_mac = mini_chromium_is_mac
crashpad_is_ios = mini_chromium_is_ios
crashpad_is_tvos = crashpad_is_ios && target_platform == "tvos"
crashpad_is_apple = mini_chromium_is_apple
crashpad_is_win = mini_chromium_is_win
crashpad_is_linux = mini_chromium_is_linux
Expand Down
2 changes: 2 additions & 0 deletions build/fuchsia_envs.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ def main(args):
os.environ['SRC_ROOT'], 'third_party/fuchsia/sdk/linux-amd64/')
os.environ['FUCHSIA_GN_SDK_ROOT'] = os.path.join(
os.environ['SRC_ROOT'], 'third_party/fuchsia-gn-sdk/src')
os.environ['FUCHSIA_READELF'] = os.path.join(os.environ['SRC_ROOT'],
'third_party/fuchsia/clang/linux-amd64/bin/llvm-readelf')

return subprocess.run(args).returncode

Expand Down
21 changes: 17 additions & 4 deletions build/ios/setup_ios_gn.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
import tempfile


SUPPORTED_TARGETS = ('iphoneos', 'iphonesimulator', 'maccatalyst')
SUPPORTED_TARGETS = ('appletvos', 'appletvsimulator', 'iphoneos',
'iphonesimulator', 'maccatalyst')
SUPPORTED_CONFIGS = ('Debug', 'Release', 'Profile', 'Official')

# Pattern matching lines from ~/.lldbinit that must not be copied to the
Expand Down Expand Up @@ -92,17 +93,29 @@ class GnGenerator(object):
FAT_BUILD_DEFAULT_ARCH = '64-bit'

TARGET_CPU_VALUES = {
'appletvos': '"arm64"',
'appletvsimulator': HostCpuArch(),
'iphoneos': '"arm64"',
'iphonesimulator': HostCpuArch(),
'maccatalyst': HostCpuArch(),
}

TARGET_ENVIRONMENT_VALUES = {
'appletvos': '"device"',
'appletvsimulator': '"simulator"',
'iphoneos': '"device"',
'iphonesimulator': '"simulator"',
'maccatalyst': '"catalyst"'
}

TARGET_PLATFORM_VALUES = {
'appletvos': '"tvos"',
'appletvsimulator': '"tvos"',
'iphoneos': '"iphoneos"',
'iphonesimulator': '"iphoneos"',
'maccatalyst': '"iphoneos"'
}

def __init__(self, settings, config, target):
assert target in SUPPORTED_TARGETS
assert config in SUPPORTED_CONFIGS
Expand Down Expand Up @@ -130,9 +143,9 @@ def _GetGnArgs(self):
args.append(('use_system_xcode', False))

args.append(('target_cpu', self.TARGET_CPU_VALUES[self._target]))
args.append((
'target_environment',
self.TARGET_ENVIRONMENT_VALUES[self._target]))
args.append(
('target_environment', self.TARGET_ENVIRONMENT_VALUES[self._target]))
args.append(('target_platform', self.TARGET_PLATFORM_VALUES[self._target]))

# Add user overrides after the other configurations so that they can
# refer to them and override them.
Expand Down
Loading