Merge pull request #70 from backtrace-labs/gm4sl/sync-upstream-2025-03-26

Merge upstream/main from 2025-03-26

Author: gm4sl

.gitattributes

@@ -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

.gitignore

@@ -12,20 +12,25 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Keep sorted
+
 *.Makefile
 *.ninja
 *.pyc
 *.target.mk
 *.xcodeproj
 *~
 .*.sw?
-.cache
 .DS_Store
+.cache
 .gdb_history
 .gdbinit
+/.vscode/
 /Makefile
+/build/fuchsia
 /out
 /third_party/edo/edo
+/third_party/fuchsia-gn-sdk
 /third_party/fuchsia/.cipd
 /third_party/fuchsia/clang
 /third_party/fuchsia/qemu
@@ -36,10 +41,12 @@
 /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
 tag

AUTHORS

@@ -13,3 +13,4 @@ Vewd Software AS
 LG Electronics, Inc.
 MIPS Technologies, Inc.
 Darshan Sen <[email protected]>
+Ho Cheung <[email protected]>

BUILD.gn

@@ -39,7 +39,8 @@ if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
     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/108368): Remove this once the underlying issue is addressed.
+      # TODO(fxbug.dev/42059784): Remove this once the underlying issue is
+      # addressed.
       exclude_toolchain_tags = [ "hwasan" ]
     }
     if (crashpad_is_android) {
@@ -123,11 +124,6 @@ if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
       deps = _resources
     }
 
-    fuchsia_shell_package("crashpad-database-util") {
-      package_name = "crashpad_database_util"
-      deps = [ "tools:crashpad_database_util" ]
-    }
-
     group("tests") {
       testonly = true
 

DEPS

@@ -29,7 +29,7 @@ vars = {
 deps = {
   'buildtools':
       Var('chromium_git') + '/chromium/src/buildtools.git@' +
-      '8b16338d17cd71b04a6ba28da7322ab6739892c2',
+      'efa920ce144e4dc1c1841e73179cd7e23b9f0d5e',
   'buildtools/clang_format/script':
       Var('chromium_git') +
       '/external/github.com/llvm/llvm-project/clang/tools/clang-format.git@' +
@@ -44,22 +44,22 @@ deps = {
       'af29db7ec28d6df1c7f0f745186884091e602e07',
   'crashpad/third_party/lss/lss':
       Var('chromium_git') + '/linux-syscall-support.git@' +
-      'e1e7b0ad8ee99a875b272c8e33e308472e897660',
+      '9719c1e1e676814c456b55f5f070eabad6709d31',
   'crashpad/third_party/mini_chromium/mini_chromium':
       Var('chromium_git') + '/chromium/mini_chromium@' +
-      '4332ddb6963750e1106efdcece6d6e2de6dc6430',
+      '7477036e238e54f220bed206f71036db8064dd34',
   'crashpad/third_party/libfuzzer/src':
       Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git@' +
       'fda403cf93ecb8792cb1d061564d89a6553ca020',
   'crashpad/third_party/zlib/zlib':
       Var('chromium_git') + '/chromium/src/third_party/zlib@' +
-      '13dc246a58e4b72104d35f9b1809af95221ebda7',
+      'fef58692c1d7bec94c4ed3d030a45a1832a9615d',
 
   # CIPD packages.
   'buildtools/linux64': {
     'packages': [
       {
-        'package': 'gn/gn/linux-amd64',
+        'package': 'gn/gn/linux-${{arch}}',
         'version': Var('gn_version'),
       }
     ],
@@ -86,11 +86,21 @@ deps = {
     'dep_type': 'cipd',
     'condition': 'host_os == "win"',
   },
+  'crashpad/build/fuchsia': {
+     'packages': [
+       {
+        'package': 'chromium/fuchsia/test-scripts',
+        'version': 'latest',
+       }
+     ],
+     'condition': 'checkout_fuchsia',
+     'dep_type': 'cipd',
+  },
   'crashpad/third_party/linux/clang/linux-amd64': {
     'packages': [
       {
-        'package': 'fuchsia/clang/linux-amd64',
-        'version': 'goma',
+        'package': 'fuchsia/third_party/clang/linux-amd64',
+        'version': 'Tpc85d1ZwSlZ6UKl2d96GRUBGNA5JKholOKe24sRDr0C',
       },
     ],
     'condition': 'checkout_linux and pull_linux_clang',
@@ -99,8 +109,8 @@ deps = {
   'crashpad/third_party/fuchsia/clang/mac-amd64': {
     'packages': [
       {
-        'package': 'fuchsia/clang/mac-amd64',
-        'version': 'goma',
+        'package': 'fuchsia/third_party/clang/mac-amd64',
+        'version': 'latest',
       },
     ],
     'condition': 'checkout_fuchsia and host_os == "mac"',
@@ -109,27 +119,40 @@ deps = {
   'crashpad/third_party/fuchsia/clang/linux-amd64': {
     'packages': [
       {
-        'package': 'fuchsia/clang/linux-amd64',
-        'version': 'goma',
+        'package': 'fuchsia/third_party/clang/linux-amd64',
+        'version': 'latest',
       },
     ],
     'condition': 'checkout_fuchsia and host_os == "linux"',
     'dep_type': 'cipd'
   },
-  'crashpad/third_party/fuchsia/sdk/mac-amd64': {
+  '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': [
       {
-        'package': 'fuchsia/sdk/gn/mac-amd64',
+        'package': 'chromium/fuchsia/gn-sdk',
         'version': 'latest'
       },
     ],
-    'condition': 'checkout_fuchsia and host_os == "mac"',
+    'condition': 'checkout_fuchsia',
     'dep_type': 'cipd'
   },
   'crashpad/third_party/fuchsia/sdk/linux-amd64': {
     'packages': [
       {
-        'package': 'fuchsia/sdk/gn/linux-amd64',
+        'package': 'fuchsia/sdk/core/linux-amd64',
         'version': 'latest'
       },
     ],
@@ -199,54 +222,35 @@ 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',
+    # If using a local clang ("pull_linux_clang" above), also pull down a
+    # sysroot.
+    'name': 'sysroot_linux',
     'pattern': '.',
-    'condition': 'host_os == "linux"',
+    'condition': 'checkout_linux and pull_linux_clang',
     'action': [
-      'download_from_google_storage',
-      '--no_resume',
-      '--no_auth',
-      '--bucket=chromium-clang-format',
-      '--sha1_file',
-      'buildtools/linux64/clang-format.sha1',
+      'crashpad/build/install_linux_sysroot.py',
     ],
   },
   {
-    'name': 'clang_format_win',
+    # Avoid introducing unnecessary PRESUBMIT.py file from build/fuchsia.
+    # Never fail and ignore the error if the file does not exist.
+    'name': 'Remove the PRESUBMIT.py from build/fuchsia',
     'pattern': '.',
-    'condition': 'host_os == "win"',
+    'condition': 'checkout_fuchsia',
     'action': [
-      'download_from_google_storage',
-      '--no_resume',
-      '--no_auth',
-      '--bucket=chromium-clang-format',
-      '--sha1_file',
-      'buildtools/win/clang-format.exe.sha1',
+      'rm',
+      '-f',
+      'crashpad/build/fuchsia/PRESUBMIT.py',
     ],
   },
   {
-    # If using a local clang ("pull_linux_clang" above), also pull down a
-    # sysroot.
-    'name': 'sysroot_linux',
+    'name': 'Generate Fuchsia Build Definitions',
     'pattern': '.',
-    'condition': 'checkout_linux and pull_linux_clang',
+    'condition': 'checkout_fuchsia',
     'action': [
-      'crashpad/build/install_linux_sysroot.py',
+      'python3',
+      'crashpad/build/fuchsia_envs.py',
+      'crashpad/build/fuchsia/gen_build_defs.py'
     ],
   },
   {

OWNERS

@@ -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]

build/BUILD.gn

@@ -31,9 +31,8 @@ config("crashpad_is_in_fuchsia") {
 }
 
 config("flock_always_supported_defines") {
-  defines = [
-    "CRASHPAD_FLOCK_ALWAYS_SUPPORTED=$crashpad_flock_always_supported",
-  ]
+  defines =
+      [ "CRASHPAD_FLOCK_ALWAYS_SUPPORTED=$crashpad_flock_always_supported" ]
 }
 
 group("default_exe_manifest_win") {
@@ -52,16 +51,18 @@ config("crashpad_fuzzer_flags") {
   ldflags = [ "-fsanitize=address" ]
 }
 
-if (crashpad_is_ios) {
-  group("ios_enable_arc") {
-    if (crashpad_is_in_chromium) {
-      public_configs = [ "//build/config/compiler:enable_arc" ]
-    } else if (crashpad_is_standalone) {
-      public_configs =
-          [ "//third_party/mini_chromium/mini_chromium/build/config:ios_enable_arc" ]
+if (crashpad_is_apple) {
+  group("apple_enable_arc") {
+    # If `crashpad_is_in_chromium`, then because Chromium enables ARC
+    # compilation by default, no special configuration is needed.
+
+    if (crashpad_is_standalone) {
+      public_configs = [ "//third_party/mini_chromium/mini_chromium/build/config:apple_enable_arc" ]
     }
   }
+}
 
+if (crashpad_is_ios) {
   group("ios_xctest") {
     if (crashpad_is_in_chromium) {
       public_configs = [ "//build/config/ios:xctest_config" ]
@@ -71,4 +72,17 @@ if (crashpad_is_ios) {
       ]
     }
   }
+
+  if (crashpad_is_in_chromium) {
+    import("//build/config/ios/ios_sdk.gni")
+    crashpad_is_ios_app_extension = ios_is_app_extension
+  } else {
+    crashpad_is_ios_app_extension = false
+  }
+
+  config("crashpad_is_ios_app_extension") {
+    if (crashpad_is_ios_app_extension) {
+      defines = [ "CRASHPAD_IS_IOS_APP_EXTENSION" ]
+    }
+  }
 }

build/BUILDCONFIG.gn

@@ -69,6 +69,14 @@ if (crashpad_use_libfuzzer) {
   _default_configs += [ "//build/config:crashpad_fuzzer_flags" ]
 }
 
+if (current_os == "fuchsia") {
+  _default_configs += [
+    "//third_party/fuchsia-gn-sdk/src/config:compiler",
+    "//third_party/fuchsia-gn-sdk/src/config:runtime_library",
+  ]
+  import("//third_party/fuchsia-gn-sdk/src/gn_configs.gni")
+}
+
 _default_executable_configs = _default_configs + [
                                 "$_mini_chromium_dir/build/config:executable",
                                 "$_mini_chromium_dir/build/config:win_console",

build/config/fuchsia/gn_configs.gni

@@ -0,0 +1,32 @@
+# Copyright 2024 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.
+
+# This file is copied from
+# https://crsrc.org/c/build/config/fuchsia/gn_configs.gni?q=gn_configs.gni
+# with some local modifications to match the crashpad setup.
+
+# Path to the fuchsia SDK. This is intended for use in other templates &
+# rules to reference the contents of the fuchsia SDK.
+fuchsia_sdk = "//third_party/fuchsia/sdk/linux-amd64"
+
+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
+  # prepare_package_inputs.py via the --readelf-exec flag.
+  # Must be a GN path (not an absolute path) since it is adjusted with
+  # rebase_path().
+  if (!defined(fuchsia_sdk_readelf_exec)) {
+    fuchsia_sdk_readelf_exec = ""
+  }
+}