Merge #540 by ted-xie: Fix bazelCI

* Plumb resource processor manifest_merger_order flag properly in presubmit.yml
* Fix integration test
* Add minimal rpbb.properties file to make rpbb integration tests pass
Closes #540

COPYBARA_INTEGRATE_REVIEW=https://github.com/bazelbuild/rules_android/pull/540 from ted-xie:fix_bazelci2 ef18a60b4c3248fe8ea2ad22ec5cb613a058a89e
PiperOrigin-RevId: 954896889
Change-Id: I39a1d758572f5c177346dfc2d8ce817cb5f3ebdc

rules/BUILD

diff --git a/rules/BUILD b/rules/BUILD
index 7f79f07..4c45293 100644
--- a/rules/BUILD
+++ b/rules/BUILD
@@ -51,6 +51,7 @@
     deps = [
         ":add_constraints_bzl",
         ":visibility_bzl",
+        "//flags:bzl",
         "//providers:providers_bzl",
         "//rules/acls:bzl",
         "//rules/android_common:bzl",
@@ -100,6 +101,7 @@
     srcs = [
         "android_host_hybrid_mode_transition.bzl",
     ],
+    visibility = ["//:__subpackages__"],
     deps = [
         ":visibility_bzl",
     ],

src/tools/java/com/google/devtools/build/android/BUILD

diff --git a/src/tools/java/com/google/devtools/build/android/BUILD b/src/tools/java/com/google/devtools/build/android/BUILD
index 8af73b8..a1a3a97 100644
--- a/src/tools/java/com/google/devtools/build/android/BUILD
+++ b/src/tools/java/com/google/devtools/build/android/BUILD
@@ -64,6 +64,12 @@
     ],
 )
 
+genrule(
+    name = "rpbb_properties",
+    outs = ["rpbb.properties"],
+    cmd = "echo use_visibility_from_aapt2=true > $@",
+)
+
 java_library(
     name = "android_builder_lib",
     srcs = glob(
@@ -82,6 +88,7 @@
             "Fnv1a32bHash.java",
         ],
     ),
+    resources = [":rpbb_properties"],
     javacopts = [
         "--add-exports=java.xml/com.sun.org.apache.xerces.internal.dom=ALL-UNNAMED",
     ],

test/rules/android_sdk_repository/android_helper.sh

diff --git a/test/rules/android_sdk_repository/android_helper.sh b/test/rules/android_sdk_repository/android_helper.sh
index 3ddac3c..42dea48 100644
--- a/test/rules/android_sdk_repository/android_helper.sh
+++ b/test/rules/android_sdk_repository/android_helper.sh
@@ -63,6 +63,8 @@
 EOF
 
 touch "${dest_dir}/providers/BUILD"
+mkdir -p "${dest_dir}/flags"
+touch "${dest_dir}/flags/BUILD"
 
   cat > "${dest_dir}/MODULE.bazel" <<EOF
 module(name = "rules_android")
@@ -72,6 +74,7 @@
 bazel_dep(name = "rules_java", version = "9.3.0")
 bazel_dep(name = "rules_cc", version = "0.2.14")
 bazel_dep(name = "rules_shell", version = "0.6.1")
+bazel_dep(name = "bazel_skylib", version = "1.8.1")
 
 rules_java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains")
 use_repo(rules_java_toolchains, "remote_java_tools")