Roll Chromium from 57b220f0ca60 to a4089b2e7987 (733 revisions)

Manually add third_party/cpu_features DEPS per https://chromium-review.googlesource.com/c/chromium/src/+/4545271 57b220f0ca..a4089b2e79 If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/chromium-angle-autoroll Please CC angle-team@google.com,solti@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Chromium: https://bugs.chromium.org/p/chromium/issues/entry To file a bug in ANGLE: https://bugs.chromium.org/p/angleproject/issues/entry To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md Changed dependencies * build: 6cb0fb63f3..1ee2c02fc6 * testing: 5102dd5718..dddefcbae6 * third_party/abseil-cpp: 48cb81215e..2445bb17e1 * third_party/android_build_tools/lint: pSX8QZklEn1odNNyvBBDnanIA4IBlNNFgsAYPXnk-SYC..FObSM0x4tmlkstBzjEhG3sHenn993tmoNjl5naaW28AC * third_party/android_build_tools/manifest_merger: guwWgYx931yQa5Mj6M08VMupp2R1bo_2F6zOS-azX9UC..u2r6t6i4MR-JZBn40RJTHzLBwT4y59mjHv6kkrAlLSQC * third_party/android_ndk: https://chromium.googlesource.com/android_ndk.git/+log/8388a2be54..310956bd12 * third_party/android_platform: f312145c41..9f29aca7dd * third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/{catapult_..9f3ef9c2ea * third_party/depot_tools: 530d86d40b..05ab73be51 * third_party/fuchsia-sdk/sdk: version:12.20230529.1.1..version:12.20230530.1.1 * third_party/r8: 9dmrdF_0VI2W4VoKglVJJXLHpn8Aw00PAHSpkQL63hcC..4Oq32DG2vuDh7Frxj6tH5xyi77sVgBWpvvl4hwvZRR4C * third_party/zlib: 337322d10f..0cf42a2592 * tools/mb: fa0546ccb6..b86e044e91 * tools/perf: 2ff63e72c7..6f1c5c73da No update to Clang. Bug: chromium:1446042 No-try: true Change-Id: Id621741615cdfd54657f8f6cb9f88ec303dcb0a2 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4575480 Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
2026-01-03 14:09:33 +03:00 · 2023-05-31 09:51:13 +00:00
parent eaa5327992
commit 0bc1395837
6 changed files with 100 additions and 15 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,7 @@
 /third_party/cherry
 /third_party/clang-format/script
 /third_party/colorama/src
+/third_party/cpu_features/src
 /third_party/depot_tools
 /third_party/EGL-Registry/src
 /third_party/flatbuffers/src
--- a/35
+++ b/35
@@ -43,7 +43,7 @@ vars = {
  'checkout_angle_mesa': False,

  # Version of Chromium our Chromium-based DEPS are mirrored from.
-  'chromium_revision': '57b220f0ca60dfaf2ca1f5cb0b1ea31f3940e966',
+  'chromium_revision': 'a4089b2e798717b0066052edb73ee0e16f300d2c',
  # We never want to checkout chromium,
  # but need a dummy DEPS entry for the autoroller
  'dummy_checkout_chromium': False,
@@ -88,11 +88,11 @@ vars = {
  # Three lines of non-changing comments so that
  # the commit queue can handle CLs rolling catapult
  # and whatever else without interference from each other.
-  'catapult_revision': '44beba1e6d819a2154b069bc1fd76878b47f33d1',
+  'catapult_revision': '9f3ef9c2eae9b1adabde88efe5dcc438ba76e205',

  # the commit queue can handle CLs rolling Fuchsia sdk
  # and whatever else without interference from each other.
-  'fuchsia_version': 'version:12.20230529.1.1',
+  'fuchsia_version': 'version:12.20230530.1.1',

  # Three lines of non-changing comments so that
  # the commit queue can handle CLs rolling luci-go
@@ -140,7 +140,7 @@ vars = {
 deps = {

  'build': {
-    'url': '{chromium_git}/chromium/src/build.git@6cb0fb63f386821bc0dd7985bcc708c689d01038',
+    'url': '{chromium_git}/chromium/src/build.git@1ee2c02fc66547e8188ed9276fca404bdaa1d895',
    'condition': 'not build_with_chromium',
  },

@@ -203,12 +203,12 @@ deps = {
  },

  'testing': {
-    'url': '{chromium_git}/chromium/src/testing@5102dd571882936d2ac900f863294ec0ec209720',
+    'url': '{chromium_git}/chromium/src/testing@dddefcbae6f8a6ea82e2cc9da41429d1ed7f4761',
    'condition': 'not build_with_chromium',
  },

  'third_party/abseil-cpp': {
-    'url': '{chromium_git}/chromium/src/third_party/abseil-cpp@48cb81215e425bdfbd96b91921718ef3abb638ff',
+    'url': '{chromium_git}/chromium/src/third_party/abseil-cpp@2445bb17e14865c24462324d1bb40afd644bfdba',
    'condition': 'not build_with_chromium',
  },

@@ -254,7 +254,7 @@ deps = {
      'packages': [
          {
               'package': 'chromium/third_party/android_build_tools/lint',
-               'version': 'pSX8QZklEn1odNNyvBBDnanIA4IBlNNFgsAYPXnk-SYC',
+               'version': 'FObSM0x4tmlkstBzjEhG3sHenn993tmoNjl5naaW28AC',
          },
      ],
      'condition': 'checkout_android and not build_with_chromium',
@@ -265,7 +265,7 @@ deps = {
      'packages': [
          {
               'package': 'chromium/third_party/android_build_tools/manifest_merger',
-               'version': 'guwWgYx931yQa5Mj6M08VMupp2R1bo_2F6zOS-azX9UC',
+               'version': 'u2r6t6i4MR-JZBn40RJTHzLBwT4y59mjHv6kkrAlLSQC',
          },
      ],
      'condition': 'checkout_android and not build_with_chromium',
@@ -278,12 +278,12 @@ deps = {
  },

  'third_party/android_ndk': {
-    'url': '{chromium_git}/android_ndk.git@8388a2be5421311dc75c5f937aae13d821a27f3d',
+    'url': '{chromium_git}/android_ndk.git@310956bd122ec2b96049f8d7398de6b717f3452e',
    'condition': 'checkout_android and not build_with_chromium',
  },

  'third_party/android_platform': {
-    'url': '{chromium_git}/chromium/src/third_party/android_platform@f312145c4191affc66e7a1d46194f0d6c9dec438',
+    'url': '{chromium_git}/chromium/src/third_party/android_platform@9f29aca7dd5ad56865863e5810ffb96756c241c3',
    'condition': 'checkout_android and not build_with_chromium',
  },

@@ -379,8 +379,13 @@ deps = {
    'condition': 'checkout_android and not build_with_chromium',
  },

+  'third_party/cpu_features/src': {
+    'url': Var('chromium_git') + '/external/github.com/google/cpu_features.git' + '@' + '936b9ab5515dead115606559502e3864958f7f6e',
+    'condition': 'checkout_android and not build_with_chromium',
+  },
+
  'third_party/depot_tools': {
-    'url': '{chromium_git}/chromium/tools/depot_tools.git@530d86d40b2aab70e0541ea0f296388ec09f0576',
+    'url': '{chromium_git}/chromium/tools/depot_tools.git@05ab73be51774f098eb580eda6e96a49e1010b1b',
    'condition': 'not build_with_chromium',
  },

@@ -588,7 +593,7 @@ deps = {
      'packages': [
          {
              'package': 'chromium/third_party/r8',
-              'version': '9dmrdF_0VI2W4VoKglVJJXLHpn8Aw00PAHSpkQL63hcC',
+              'version': '4Oq32DG2vuDh7Frxj6tH5xyi77sVgBWpvvl4hwvZRR4C',
          },
      ],
      'condition': 'checkout_android and not build_with_chromium',
@@ -659,7 +664,7 @@ deps = {
  },

  'third_party/zlib': {
-    'url': '{chromium_git}/chromium/src/third_party/zlib@337322d10f407b25671768f092e55f306c1a1101',
+    'url': '{chromium_git}/chromium/src/third_party/zlib@0cf42a25928471256649733bbc561c564becf1af',
    'condition': 'not build_with_chromium',
  },

@@ -700,7 +705,7 @@ deps = {
  },

  'tools/mb': {
-    'url': '{chromium_git}/chromium/src/tools/mb@fa0546ccb6a6ddb3634cabf8526f9932e059cb42',
+    'url': '{chromium_git}/chromium/src/tools/mb@b86e044e91ab6668553a3bc4491566386e8b950b',
    'condition': 'not build_with_chromium',
  },

@@ -715,7 +720,7 @@ deps = {
  },

  'tools/perf': {
-    'url': '{chromium_git}/chromium/src/tools/perf@2ff63e72c782a0759b17c0ed33c5e004d603af14',
+    'url': '{chromium_git}/chromium/src/tools/perf@6f1c5c73da66ce3ad596a0601f0d169b35bb249c',
    'condition': 'not build_with_chromium',
  },

--- a/scripts/roll_chromium_deps.py
+++ b/scripts/roll_chromium_deps.py
@@ -58,6 +58,7 @@ ANGLE_CHROMIUM_DEPS = [
    'third_party/catapult',
    'third_party/clang-format/script',
    'third_party/colorama/src',
+    'third_party/cpu_features/src',
    'third_party/depot_tools',
    'third_party/flatbuffers/src',
    'third_party/fuchsia-sdk/sdk',
--- a/third_party/cpu_features/BUILD.gn
+++ b/third_party/cpu_features/BUILD.gn
@@ -0,0 +1,61 @@
+# Copyright 2023 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+config("cpu_features_config") {
+  cflags = [ "-Wno-unused-function" ]
+  defines = [
+    "STACK_LINE_READER_BUFFER_SIZE=1024",
+    "HAVE_STRONG_GETAUXVAL",
+  ]
+  include_dirs = [ "src/include" ]
+}
+
+config("ndk_compat_headers") {
+  include_dirs = [ "src/ndk_compat" ]
+}
+
+source_set("cpuinfo") {
+  sources = [
+    "src/src/copy.inl",
+    "src/src/define_introspection.inl",
+    "src/src/define_introspection_and_hwcaps.inl",
+    "src/src/equals.inl",
+    "src/src/filesystem.c",
+    "src/src/hwcaps.c",
+    "src/src/stack_line_reader.c",
+    "src/src/string_view.c",
+  ]
+  if (current_cpu == "x86" || current_cpu == "x64") {
+    sources += [
+      "src/src/impl_x86__base_implementation.inl",
+      "src/src/impl_x86_freebsd.c",
+      "src/src/impl_x86_linux_or_android.c",
+      "src/src/impl_x86_macos.c",
+      "src/src/impl_x86_windows.c",
+    ]
+  } else if (current_cpu == "arm") {
+    sources += [ "src/src/impl_arm_linux_or_android.c" ]
+  } else if (current_cpu == "arm64") {
+    sources += [ "src/src/impl_aarch64_linux_or_android.c" ]
+  } else if (current_cpu == "mips") {
+    sources += [ "src/src/impl_mips_linux_or_android.c" ]
+  } else if (current_cpu == "ppc") {
+    sources += [ "src/src/impl_ppc_linux.c" ]
+  } else if (current_cpu == "riscv64") {
+    sources += [ "src/src/impl_riscv_linux.c" ]
+  } else {
+    error("Missing definition for architecture: $current_cpu")
+  }
+  configs += [ ":cpu_features_config" ]
+}
+
+source_set("ndk_compat") {
+  sources = [
+    "src/ndk_compat/cpu-features.c",
+    "src/ndk_compat/cpu-features.h",
+  ]
+  configs += [ ":cpu_features_config" ]
+  public_configs = [ ":ndk_compat_headers" ]
+  deps = [ ":cpuinfo" ]
+}
--- a/third_party/cpu_features/OWNERS
+++ b/third_party/cpu_features/OWNERS
@@ -0,0 +1,3 @@
+prashanthsw@google.com
+nellyv@google.com
+kgong@google.com
--- a/third_party/cpu_features/README.chromium
+++ b/third_party/cpu_features/README.chromium
@@ -0,0 +1,14 @@
+Name: cpu_features
+Short Name: cpu_features
+URL: https://github.com/google/cpu_features
+Version: v0.8.0
+Date: 2023/05/17
+License: Apache 2.0
+License File: src/LICENSE
+Security Critical: Yes
+
+Description:
+cpu_features is a library to retrieve CPU features at runtime. It is used to
+make decisions about performance optimization and features a drop-in replacement
+for Android's cpu-features.h. It is Android's recommended replacement for libraries
+that utilize cpu-features.h.