summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Warrington <cmw@google.com>2021-08-20 14:53:45 +0100
committerChris Warrington <cmw@google.com>2021-08-20 14:53:45 +0100
commitccf7c1712408e59df988f8defe449439386ba1fe (patch)
treee3a3d90ef92f82d799f7192c5fced9b2a2da45a4
parent236fd6f46dbf617572a67be2340bf8557471a67b (diff)
downloaddata-binding-ccf7c1712408e59df988f8defe449439386ba1fe.tar.gz
Use merged_zip rule directly
Rather than the zip_merger macro, which is removed in I416eba83715fb8b753ce5656c32ee275f99aa8ce Bug: 197232043 Test: Existing Change-Id: Ib700ed1ee00951ef7b43908139dccc184857f092
-rw-r--r--BUILD.bazel4
1 files changed, 2 insertions, 2 deletions
diff --git a/BUILD.bazel b/BUILD.bazel
index 925b2a2c..325673eb 100644
--- a/BUILD.bazel
+++ b/BUILD.bazel
@@ -3,7 +3,7 @@ load("//tools/base/bazel:kotlin.bzl", "kotlin_test")
load("//tools/base/bazel:utils.bzl", "fileset", "merged_properties")
load("//tools/base/bazel:gradle.bzl", "gradle_build")
load("//tools/base/bazel:maven.bzl", "maven_repository", "maven_library")
-load("//tools/base/bazel:utils.bzl", "zip_merger")
+load("//tools/base/bazel:utils.bzl", "merged_zip")
load("//tools/base/common:version.bzl", "BUILD_VERSION")
exports_files(["databinding.properties"])
@@ -351,7 +351,7 @@ filegroup(
visibility = ["//visibility:public"],
)
-zip_merger(
+merged_zip(
name = "data_binding_runtime",
srcs = [
"//tools/data-binding:data_binding_runtime_androidx.zip",