diff --git a/patches/rules_android/BUILD.bazel b/patches/rules_android/BUILD.bazel index 543bf23..8d2d931 100644 --- a/patches/rules_android/BUILD.bazel +++ b/patches/rules_android/BUILD.bazel @@ -1 +1,6 @@ -exports_files(["macos_cp_reflink.patch", "guava_version.patch"]) \ No newline at end of file +exports_files([ + "macos_cp_reflink.patch", + "guava_version.patch", + "databinding_output_dash" + ] +) \ No newline at end of file diff --git a/patches/rules_android/databinding_ouput_dash b/patches/rules_android/databinding_ouput_dash new file mode 100644 index 0000000..68b3735 --- /dev/null +++ b/patches/rules_android/databinding_ouput_dash @@ -0,0 +1,16 @@ +--- a/rules/data_binding.bzl ++++ b/rules/data_binding.bzl +@@ -257,11 +257,11 @@ def _process( + if defines_resources: + # Outputs of the Data Binding annotation processor. + br_out = ctx.actions.declare_file( +- output_dir + "bin-files/%s-br.bin" % java_package, ++ output_dir + "bin-files/%s--br.bin" % java_package, + ) + db_info[_JAVA_ANNOTATION_PROCESSOR_ADDITIONAL_OUTPUTS].append(br_out) + setter_store_out = ctx.actions.declare_file( +- output_dir + "bin-files/%s-setter_store.json" % java_package, ++ output_dir + "bin-files/%s--setter_store.json" % java_package, + ) + db_info[_JAVA_ANNOTATION_PROCESSOR_ADDITIONAL_OUTPUTS].append( + setter_store_out, diff --git a/rules/repositories.bzl b/rules/repositories.bzl index dfad9ca..8ed6dee 100644 --- a/rules/repositories.bzl +++ b/rules/repositories.bzl @@ -14,6 +14,7 @@ def _android(): patches = [ "@grab_bazel_common//patches/rules_android:macos_cp_reflink.patch", "@grab_bazel_common//patches/rules_android:guava_version.patch", + "@grab_bazel_common//patches/rules_android:databinding_output_dash.patch" ], patch_args = ["-p1"], )