Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
6 changes: 3 additions & 3 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -150,12 +150,12 @@ REPOSITORY_LOCATIONS_SPEC = dict(
project_name = "Abseil",
project_desc = "Open source collection of C++ libraries drawn from the most fundamental pieces of Google’s internal codebase",
project_url = "https://abseil.io/",
version = "8317b9a01cbc32594ad4bf971709c97cb13ec921",
sha256 = "f772811a2d5dff79da54e24d6d4f5f5bc06d49e4d4ef4107f74a6c361edada99",
version = "6dab0bd99c5856e747fe35e928395ae80ca5e5f1",
sha256 = "356d194d166c82695ee74be6cd76d3367177bf400bd22a7904f24811c11729e0",
strip_prefix = "abseil-cpp-{version}",
urls = ["https://github.com/abseil/abseil-cpp/archive/{version}.tar.gz"],
use_category = ["dataplane_core", "controlplane"],
release_date = "2022-10-06",
release_date = "2022-12-06",
cpe = "N/A",
license = "Apache-2.0",
license_url = "https://github.com/abseil/abseil-cpp/blob/{version}/LICENSE",
Expand Down
11 changes: 0 additions & 11 deletions mobile/bazel/abseil.patch

This file was deleted.

13 changes: 0 additions & 13 deletions mobile/bazel/envoy_mobile_repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,6 @@ def upstream_envoy_overrides():
build_file_content = """filegroup(name = "all", srcs = glob(["**"]), visibility = ["//visibility:public"])""",
)

# Patch upstream Abseil to prevent Foundation dependency from leaking into Android builds.
# Workaround for https://github.com/abseil/abseil-cpp/issues/326.
# TODO: Should be removed in https://github.com/envoyproxy/envoy-mobile/issues/136 once rules_android
# supports platform toolchains.
http_archive(
name = "com_google_absl",
patches = ["@envoy_mobile//bazel:abseil.patch"],
sha256 = "3a0bb3d2e6f53352526a8d1a7e7b5749c68cd07f2401766a404fb00d2853fa49",
strip_prefix = "abseil-cpp-4bbdb026899fea9f882a95cbd7d6a4adaf49b2dd",
# 2022-07-05
urls = ["https://github.com/abseil/abseil-cpp/archive/4bbdb026899fea9f882a95cbd7d6a4adaf49b2dd.tar.gz"],
)

# This should be kept in sync with Envoy itself, we just need to apply this patch
# Remove this once https://boringssl-review.googlesource.com/c/boringssl/+/37804 is in master-with-bazel
http_archive(
Expand Down