From 01ca25b429b2e9ff2d7e5271367aa545fe3ba62a Mon Sep 17 00:00:00 2001 From: Esun Kim Date: Tue, 17 Dec 2019 13:06:51 -0800 Subject: [PATCH] Squashed 'third_party/upb/' changes from 8a3ae1ef3e..2a25fd557e 2a25fd557e Merge pull request #226 from lizan/upb_bazel_version b973c06480 prefix bazel_version git-subtree-dir: third_party/upb git-subtree-split: 2a25fd557e1fff9b2c7377a9eb91e2ebcd21470c --- bazel/upb_proto_library.bzl | 2 +- bazel/workspace_deps.bzl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bazel/upb_proto_library.bzl b/bazel/upb_proto_library.bzl index f148745be5e..21ed34b487a 100644 --- a/bazel/upb_proto_library.bzl +++ b/bazel/upb_proto_library.bzl @@ -8,7 +8,7 @@ load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain") # copybara:strip_for_google3_begin load("@bazel_skylib//lib:versions.bzl", "versions") -load("@bazel_version//:bazel_version.bzl", "bazel_version") +load("@upb_bazel_version//:bazel_version.bzl", "bazel_version") # copybara:strip_end # Generic support code ######################################################### diff --git a/bazel/workspace_deps.bzl b/bazel/workspace_deps.bzl index 7dbd761d057..23ebae11d1f 100644 --- a/bazel/workspace_deps.bzl +++ b/bazel/workspace_deps.bzl @@ -5,7 +5,7 @@ load("//bazel:repository_defs.bzl", "bazel_version_repository") def upb_deps(): bazel_version_repository( - name = "bazel_version", + name = "upb_bazel_version", ) git_repository(