Merge pull request #88 from getsentry/meta/update

meta: update 2023-09-28
getsentry · Oct 2, 2023 · 12e1dae · 12e1dae
2 parents 432ff49 + f37da0f
commit 12e1dae
Show file tree

Hide file tree

Showing 164 changed files with 1,988 additions and 740 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -123,11 +123,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
 

diff --git a/DEPS b/DEPS
@@ -44,10 +44,10 @@ 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',
+      '10f39a97650a0fe0b305415c15434443c0690a20',
   'crashpad/third_party/libfuzzer/src':
       Var('chromium_git') + '/chromium/llvm-project/compiler-rt/lib/fuzzer.git@' +
       'fda403cf93ecb8792cb1d061564d89a6553ca020',
@@ -59,7 +59,7 @@ deps = {
   'buildtools/linux64': {
     'packages': [
       {
-        'package': 'gn/gn/linux-amd64',
+        'package': 'gn/gn/linux-${{arch}}',
         'version': Var('gn_version'),
       }
     ],
@@ -116,10 +116,15 @@ deps = {
     'condition': 'checkout_fuchsia and host_os == "linux"',
     'dep_type': 'cipd'
   },
+  'crashpad/third_party/fuchsia-gn-sdk': {
+    'url': Var('chromium_git') + '/chromium/src/third_party/fuchsia-gn-sdk.git@' +
+           '0d6902558d92fe3d49ba9a8f638ddea829be595b',
+    'condition': 'checkout_fuchsia',
+  },
   'crashpad/third_party/fuchsia/sdk/mac-amd64': {
     'packages': [
       {
-        'package': 'fuchsia/sdk/gn/mac-amd64',
+        'package': 'fuchsia/sdk/core/mac-amd64',
         'version': 'latest'
       },
     ],
@@ -129,7 +134,7 @@ deps = {
   'crashpad/third_party/fuchsia/sdk/linux-amd64': {
     'packages': [
       {
-        'package': 'fuchsia/sdk/gn/linux-amd64',
+        'package': 'fuchsia/sdk/core/linux-amd64',
         'version': 'latest'
       },
     ],
@@ -249,6 +254,15 @@ hooks = [
       'crashpad/build/install_linux_sysroot.py',
     ],
   },
+  {
+    'name': 'Generate Fuchsia Build Definitions',
+    'pattern': '.',
+    'condition': 'checkout_fuchsia',
+    'action': [
+      'python3',
+      'crashpad/build/fuchsia/gen_build_defs.py'
+    ],
+  },
   {
     'name': 'setup_gn_ios',
     'pattern': '.',

diff --git a/build/BUILD.gn b/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" ]

diff --git a/build/crashpad_buildconfig.gni b/build/crashpad_buildconfig.gni
@@ -59,6 +59,7 @@ if (crashpad_is_external || crashpad_is_in_dart) {
 if (crashpad_is_in_chromium) {
   crashpad_is_mac = is_mac
   crashpad_is_ios = is_ios
+  crashpad_is_apple = is_apple
   crashpad_is_win = is_win
   crashpad_is_linux = is_linux || is_chromeos
   crashpad_is_android = is_android
@@ -73,6 +74,7 @@ if (crashpad_is_in_chromium) {
 
   crashpad_is_mac = mini_chromium_is_mac
   crashpad_is_ios = mini_chromium_is_ios
+  crashpad_is_apple = mini_chromium_is_apple
   crashpad_is_win = mini_chromium_is_win
   crashpad_is_linux = mini_chromium_is_linux
   crashpad_is_android = mini_chromium_is_android