diff --git a/bazel/foreign_cc/BUILD b/bazel/foreign_cc/BUILD index f6049369a9ad..82fcae17b6a6 100644 --- a/bazel/foreign_cc/BUILD +++ b/bazel/foreign_cc/BUILD @@ -52,10 +52,6 @@ envoy_cmake_external( "CARES_SHARED": "no", "CARES_STATIC": "on", "CMAKE_BUILD_TYPE": "RelWithDebInfo", - # Disable ranlib because it is not handled by bazel, and therefore - # doesn't respect custom toolchains such as the Android NDK, - # see https://github.com/bazelbuild/rules_foreign_cc/issues/252 - "CMAKE_RANLIB": "", }, copy_pdb = True, lib_source = "@com_github_c_ares_c_ares//:all", @@ -95,10 +91,6 @@ envoy_cmake_external( "EVENT__DISABLE_TESTS": "on", "EVENT__LIBRARY_TYPE": "STATIC", "CMAKE_BUILD_TYPE": "Release", - # Disable ranlib because it is not handled by bazel, and therefore - # doesn't respect custom toolchains such as the Android NDK, - # see https://github.com/bazelbuild/rules_foreign_cc/issues/252 - "CMAKE_RANLIB": "", # Force _GNU_SOURCE on for Android builds. This would be contained in # a 'select' but the downstream macro uses a select on all of these # options, and they cannot be nested. @@ -126,10 +118,6 @@ envoy_cmake_external( "CMAKE_BUILD_TYPE": "RelWithDebInfo", "CMAKE_INSTALL_LIBDIR": "lib", "CMAKE_CXX_COMPILER_FORCED": "on", - # Disable ranlib because it is not handled by bazel, and therefore - # doesn't respect custom toolchains such as the Android NDK, - # see https://github.com/bazelbuild/rules_foreign_cc/issues/252 - "CMAKE_RANLIB": "", }, cmake_files_dir = "$BUILD_TMPDIR/lib/CMakeFiles", copy_pdb = True, @@ -149,10 +137,6 @@ envoy_cmake_external( "YAML_CPP_BUILD_TOOLS": "off", "CMAKE_BUILD_TYPE": "RelWithDebInfo", "CMAKE_CXX_COMPILER_FORCED": "on", - # Disable ranlib because it is not handled by bazel, and therefore - # doesn't respect custom toolchains such as the Android NDK, - # see https://github.com/bazelbuild/rules_foreign_cc/issues/252 - "CMAKE_RANLIB": "", }, lib_source = "@com_github_jbeder_yaml_cpp//:all", static_libraries = select({ @@ -167,10 +151,6 @@ envoy_cmake_external( name = "zlib", cache_entries = { "CMAKE_BUILD_TYPE": "RelWithDebInfo", - # Disable ranlib because it is not handled by bazel, and therefore - # doesn't respect custom toolchains such as the Android NDK, - # see https://github.com/bazelbuild/rules_foreign_cc/issues/252 - "CMAKE_RANLIB": "", }, copy_pdb = True, lib_source = "@net_zlib//:all", diff --git a/bazel/repository_locations.bzl b/bazel/repository_locations.bzl index d809a6f87192..5cee046006e9 100644 --- a/bazel/repository_locations.bzl +++ b/bazel/repository_locations.bzl @@ -215,10 +215,10 @@ REPOSITORY_LOCATIONS = dict( urls = ["https://github.com/bazelbuild/rules_go/releases/download/0.18.5/rules_go-0.18.5.tar.gz"], ), rules_foreign_cc = dict( - sha256 = "980c1b74f5c18ea099889b0fb0479ee34b8a02845d3d302ecb16b15d73d624c8", - strip_prefix = "rules_foreign_cc-a0dc109915cea85909bef586e2b2a9bbdc6c8ff5", - # 2019-06-04 - urls = ["https://github.com/bazelbuild/rules_foreign_cc/archive/a0dc109915cea85909bef586e2b2a9bbdc6c8ff5.tar.gz"], + sha256 = "c957e6663094a1478c43330c1bbfa71afeaf1ab86b7565233783301240c7a0ab", + strip_prefix = "rules_foreign_cc-a209b642c7687a8894c19b3dd40e43e6d3f38e83", + # 2019-07-17 + urls = ["https://github.com/bazelbuild/rules_foreign_cc/archive/a209b642c7687a8894c19b3dd40e43e6d3f38e83.tar.gz"], ), six_archive = dict( sha256 = "105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a",