Revert "Added Abseil as a third-party dependency"

This reverts commit 020d69905e.

Reason for revert: Causing Dawn Skia roll build fails

https://task-scheduler.skia.org/job/AZXXBm9h9ozj3kKiRJM5

Original change's description:
> Added Abseil as a third-party dependency
>
> Using the version in the Chromium repo in order to make use of the .gn
> files it contains.
>
> Doing so also appears to require us to switch where we pull googletest
> from so that the directory structure matches what the Abseil build
> config expects. Fortunately this doesn't seem to cause issues in our
> tests.
>
> Bug: dawn:563
> Change-Id: I55831ad33f282b3d8b03b67826fd2776e5602d89
> Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/63780
> Reviewed-by: Austin Eng <enga@chromium.org>
> Reviewed-by: Corentin Wallez <cwallez@chromium.org>
> Commit-Queue: Corentin Wallez <cwallez@chromium.org>
> Auto-Submit: Brandon Jones <bajones@chromium.org>

# Not skipping CQ checks because original CL landed > 1 day ago.

Bug: dawn:563
Change-Id: I0fc4e5fc73ab9b0887591135ec01adde990edd6f
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/64361
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Shrek Shao <shrekshao@google.com>

.gitignore

@@ -7,7 +7,6 @@
 build
 buildtools
 testing
-third_party/abseil-cpp/
 third_party/angle/
 third_party/clang-format/
 third_party/glfw/

CMakeLists.txt

@@ -94,7 +94,6 @@ option(DAWN_BUILD_EXAMPLES "Enables building Dawn's exmaples" ${BUILD_EXAMPLE})
 
 set(DAWN_THIRD_PARTY_DIR "${Dawn_SOURCE_DIR}/third_party" CACHE STRING "Directory in which to find third-party dependencies.")
 
-set(DAWN_ABSEIL_DIR "${DAWN_THIRD_PARTY_DIR}/abseil-cpp" CACHE STRING "Directory in which to find Abseil")
 set(DAWN_GLFW_DIR "${DAWN_THIRD_PARTY_DIR}/glfw" CACHE STRING "Directory in which to find GLFW")
 set(DAWN_GLM_DIR "${DAWN_THIRD_PARTY_DIR}/glm" CACHE STRING "Directory in which to find GLM")
 set(DAWN_JINJA2_DIR "${DAWN_THIRD_PARTY_DIR}/jinja2" CACHE STRING "Directory in which to find Jinja2")

DEPS

@@ -9,21 +9,6 @@ vars = {
   'swiftshader_git': 'https://swiftshader.googlesource.com',
 
   'dawn_standalone': True,
-
-  # Current revision of googletest.
-  # Note: this dep cannot be auto-rolled b/c of nesting.
-  'googletest_revision': '2d924d7a971e9667d76ad09727fb2402b4f8a1e3',
-
-  # Current revision of Chrome's third_party googletest directory. This
-  # repository is mirrored as a separate repository, with separate git hashes
-  # that don't match the external googletest repository or Chrome. Mirrored
-  # patches will have a different git hash associated with them.
-  # To roll, first get the new hash for chromium_googletest_revision from the
-  # mirror of third_party/googletest located here:
-  # https://chromium.googlesource.com/chromium/src/third_party/googletest/
-  # Then get the new hash for googletest_revision from the root Chrome DEPS
-  # file: https://source.chromium.org/chromium/chromium/src/+/main:DEPS
-  'chromium_googletest_revision': '17bbed2084d3127bd7bcd27283f18d7a5861bea8',
 }
 
 deps = {
@@ -95,7 +80,7 @@ deps = {
     'condition': 'dawn_standalone',
   },
   'third_party/googletest': {
-    'url': '{chromium_git}/chromium/src/third_party/googletest@{chromium_googletest_revision}',
+    'url': '{chromium_git}/external/github.com/google/googletest@2828773179fa425ee406df61890a150577178ea2',
     'condition': 'dawn_standalone',
   },
 
@@ -150,11 +135,6 @@ deps = {
     'url': '{chromium_git}/chromium/src/third_party/zlib@c29ee8c9c3824ca013479bf8115035527967fe02',
     'condition': 'dawn_standalone',
   },
-
-  'third_party/abseil-cpp': {
-    'url': '{chromium_git}/chromium/src/third_party/abseil-cpp@789af048b388657987c59d4da406859034fe310f',
-    'condition': 'dawn_standalone',
-  },
 }
 
 hooks = [
@@ -252,6 +232,5 @@ hooks = [
 ]
 
 recursedeps = [
-  'third_party/googletest',
   'third_party/vulkan-deps',
 ]

build_overrides/build.gni

@@ -23,10 +23,6 @@ declare_args() {
   # Android 32-bit non-component, non-clang builds cannot have symbol_level=2
   # due to 4GiB file size limit, see https://crbug.com/648948.
   ignore_elf32_limitations = false
-
-  # If true, it assumes that //third_party/abseil-cpp is an available
-  # dependency for googletest.
-  gtest_enable_absl_printers = false
 }
 
 # Detect whether we can use the hermetic XCode like in Chromium and do so if

build_overrides/dawn.gni

@@ -27,7 +27,6 @@ dawn_has_build = true
 # users of Dawn don't have to set dirs if they happen to use the same as Dawn.
 
 # The paths to Dawn's dependencies
-dawn_abseil_dir = "//third_party/abseil-cpp"
 dawn_angle_dir = "//third_party/angle"
 dawn_jinja2_dir = "//third_party/jinja2"
 dawn_glfw_dir = "//third_party/glfw"

scripts/dawn_overrides_with_defaults.gni

@@ -76,7 +76,3 @@ if (!defined(dawn_tint_dir)) {
   # Default to Tint being Dawn's DEPS
   dawn_tint_dir = "${dawn_root}/third_party/tint"
 }
-
-if (!defined(dawn_abseil_dir)) {
-  dawn_abseil_dir = "//third_party/abseil-cpp"
-}

src/dawn_native/BUILD.gn

@@ -53,32 +53,6 @@ if (dawn_enable_vulkan) {
       dawn_enable_vulkan_loader && dawn_vulkan_loader_dir != ""
 }
 
-config("dawn_abseil_config") {
-  if (dawn_standalone && is_clang) {
-    cflags = [
-      # Allow the use of enable_if()
-      "-Wno-gcc-compat",
-    ]
-  }
-
-  configs = [
-    "$dawn_abseil_dir:absl_define_config",
-    "$dawn_abseil_dir:absl_include_config",
-  ]
-}
-
-group("dawn_abseil") {
-  # When build_with_chromium=true we need to include "//third_party/abseil-cpp:absl" while
-  # we can be more specific when building standalone Dawn.
-  if (build_with_chromium) {
-    public_deps = [ "$dawn_abseil_dir:absl" ]
-  } else {
-    public_deps = [ "$dawn_abseil_dir/absl/strings:str_format" ]
-  }
-
-  public_configs = [ ":dawn_abseil_config" ]
-}
-
 config("dawn_native_internal") {
   configs = [ "${dawn_root}/src/common:dawn_internal" ]
 
@@ -168,7 +142,6 @@ source_set("dawn_native_headers") {
 # except those that define exported symbols.
 source_set("dawn_native_sources") {
   deps = [
-    ":dawn_abseil",
     ":dawn_native_headers",
     ":dawn_native_utils_gen",
     "${dawn_root}/src/common",

src/dawn_native/ShaderModule.cpp

@@ -14,7 +14,6 @@
 
 #include "dawn_native/ShaderModule.h"
 
-#include "absl/strings/str_format.h"
 #include "common/Constants.h"
 #include "common/HashUtils.h"
 #include "dawn_native/BindGroupLayout.h"
@@ -36,8 +35,10 @@ namespace dawn_native {
     namespace {
 
         std::string GetShaderDeclarationString(BindGroupIndex group, BindingNumber binding) {
-            return absl::StrFormat("the shader module declaration at set %u, binding %u",
+            std::ostringstream ostream;
-                                   static_cast<uint32_t>(group), static_cast<uint32_t>(binding));
+            ostream << "the shader module declaration at set " << static_cast<uint32_t>(group)
+                    << " binding " << static_cast<uint32_t>(binding);
+            return ostream.str();
         }
 
         tint::transform::VertexFormat ToTintVertexFormat(wgpu::VertexFormat format) {

src/tests/BUILD.gn

@@ -39,7 +39,7 @@ group("dawn_tests") {
 if (!build_with_chromium) {
   # When we aren't in Chromium we define out own targets based on the location
   # of the googletest repo.
-  googletest_dir = "${dawn_googletest_dir}/src"
+  googletest_dir = dawn_googletest_dir
 
   config("gtest_config") {
     include_dirs = [

third_party/CMakeLists.txt

@@ -59,11 +59,6 @@ if (NOT TARGET libtint)
     add_subdirectory(${DAWN_TINT_DIR})
 endif()
 
-if (NOT TARGET libabsl)
-    message(STATUS "Dawn: using Abseil at ${DAWN_ABSEIL_DIR}")
-    add_subdirectory(${DAWN_ABSEIL_DIR})
-endif()
-
 # Header-only library for khrplatform.h
 add_library(dawn_khronos_platform INTERFACE)
 target_sources(dawn_khronos_platform INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/khronos/KHR/khrplatform.h")