diff options
| author | Chris Warrington <cmw@google.com> | 2021-08-11 15:27:09 +0100 |
|---|---|---|
| committer | Chris Warrington <cmw@google.com> | 2021-08-17 18:25:49 +0100 |
| commit | cdddbf6892a0a445b82d6902c019242374a94782 (patch) | |
| tree | 1b287cd1f4963078404298a8f0a3524b28e91076 | |
| parent | 29c4636f2be35974a87f710963c4cf3f7648f460 (diff) | |
| download | data-binding-cdddbf6892a0a445b82d6902c019242374a94782.tar.gz | |
[Hybrid Build] Include databinding runtime
For now, using the existing bazel rules, switch to using zip_merger
rather than jar_merger (which does extra things that aren't needed for a
maven repo)
Bug: 193919937
Test: Updated GmavenZipTest
Change-Id: Idd6023a1bbf53d04b12274568975844f77b82d5e
| -rw-r--r-- | BUILD.bazel | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/BUILD.bazel b/BUILD.bazel index c8097e84..dd2a45c8 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:merge_archives.bzl", "merge_jars") +load("//tools/base/bazel:utils.bzl", "zip_merger") load("//tools/base/common:version.bzl", "BUILD_VERSION") exports_files(["databinding.properties"]) @@ -351,16 +351,21 @@ filegroup( visibility = ["//visibility:public"], ) -merge_jars( - name = "runtimeLibraries", - out = "data_binding_runtime.zip", - jars = [ - "//tools/data-binding:data_binding_runtime_support.zip", +zip_merger( + name = "data_binding_runtime", + srcs = [ "//tools/data-binding:data_binding_runtime_androidx.zip", + "//tools/data-binding:data_binding_runtime_support.zip", ], visibility = ["//visibility:public"], ) +alias( + name = "runtimeLibraries", + actual = ":data_binding_runtime", + visibility = ["//visibility:public"], +) + filegroup( name = "agp_gradle_build_files", srcs = glob([ |