Enables two additonal test targets in Bazel env am: 096df7d42a am: 6d5488f484

Original change: https://android-review.googlesource.com/c/platform/build/pesto/+/1697845

Change-Id: Ifc0c655b78e6246dfc5b4c5afba743114a4d804f

4 files changed, 203 insertions, 2 deletions

diff --git a/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/BUILD.bazel.template b/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/BUILD.bazel.template
index 6d4ffe3..78de3b9 100644
--- a/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/BUILD.bazel.template
+++ b/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/BUILD.bazel.template
@@ -18,4 +18,6 @@
 package(default_visibility=["//visibility:public"])
 exports_files(["lunch.bzl", "tf_test_executable.sh.template"])
 
-sh_binary(name="cc_tf_test_launcher", srcs=["cc_tf_test_launcher.sh"])
\ No newline at end of file
+sh_binary(name="android_tf_test_launcher", srcs=["android_tf_test_launcher.sh"])
+sh_binary(name="cc_tf_test_launcher", srcs=["cc_tf_test_launcher.sh"])
+sh_binary(name="java_tf_test_launcher", srcs=["java_tf_test_launcher.sh"])
\ No newline at end of file
diff --git a/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/android_test.bzl.template b/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/android_test.bzl.template
new file mode 100644
index 0000000..458f886
--- /dev/null
+++ b/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/android_test.bzl.template
@@ -0,0 +1,105 @@
+# Copyright {year}, The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# WARNING: This BUILD file was generated by a tool.
+# It should not be manually modified.
+"""android_test implementation for the Android environment."""
+
+
+def _android_test_impl(ctx):
+    # Emit the launcher script.
+    script = ctx.actions.declare_file("%s.sh" % ctx.label.name)
+
+    ctx.actions.expand_template(
+        template=ctx.file._template,
+        output=script,
+        substitutions={{
+            "{{module_name}}":
+            ctx.label.name,
+            "{{module_path}}":
+            ctx.label.package,
+            "{{tradefed_launcher_module_path}}":
+            ctx.attr._tradefed_launcher.label.package,
+            "{{tradefed_jars_module_path}}":
+            ctx.attr._tradefed_jars.label.package,
+            "{{path_additions}}":
+            ":".join([
+                ctx.attr._adb.label.package,
+                ctx.attr._aapt.label.package,
+            ]),
+            "{{launcher_path}}":
+            "{{}}/{{}}".format(
+                ctx.attr._launcher.label.package,
+                ctx.attr._launcher.label.name,
+            ),
+        }},
+        is_executable=True,
+    )
+
+    # Pass the deps on as runfiles as Tradefed will scan the resulting
+    # directory for tests.
+    runfiles = ctx.runfiles(
+        files=ctx.files._launcher,
+        transitive_files=depset(transitive=[
+            depset(ctx.files.deps),
+            depset(ctx.files._adb),
+            depset(ctx.files._aapt),
+            depset(ctx.files._tradefed_launcher),
+            depset(ctx.files._tradefed_script_help),
+            depset(ctx.files._tradefed_jars),
+        ], ),
+    )
+
+    return [DefaultInfo(executable=script, runfiles=runfiles)]
+
+
+android_test = rule(
+    _android_test_impl,
+    attrs={{
+        "_adb":
+        attr.label(
+            default=Label("//packages/modules/adb"),
+            allow_single_file=True,
+        ),
+        "_aapt":
+        attr.label(
+            default=Label("//frameworks/base/tools/aapt"),
+            allow_single_file=True,
+        ),
+        "_tradefed_launcher":
+        attr.label(
+            default=Label("//tools/tradefederation/core:atest_tradefed"),
+            allow_single_file=True,
+        ),
+        "_tradefed_script_help":
+        attr.label(
+            default=Label("//tools/tradefederation/core:script_help"), ),
+        "_tradefed_jars":
+        attr.label(
+            default=Label("//tools/tradefederation/core:tradefed_lib"), ),
+        "_template":
+        attr.label(
+            default=Label(
+                "//build/bazel/rules:tf_test_executable.sh.template", ),
+            allow_single_file=True,
+        ),
+        "_launcher":
+        attr.label(
+            default=Label("//build/bazel/rules:android_tf_test_launcher")),
+        "deps":
+        attr.label_list(allow_files=True),
+    }},
+    executable=True,
+    test=True,
+)
diff --git a/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/cc_test.bzl.template b/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/cc_test.bzl.template
index 588f881..c6f5c46 100644
--- a/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/cc_test.bzl.template
+++ b/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/cc_test.bzl.template
@@ -27,7 +27,7 @@ def _cc_test_impl(ctx):
             "{{module_path}}": ctx.label.package,
             "{{tradefed_launcher_module_path}}": ctx.attr._tradefed_launcher.label.package,
             "{{tradefed_jars_module_path}}": ctx.attr._tradefed_jars.label.package,
-            "{{adb_path}}": ctx.attr._adb.label.package,
+            "{{path_additions}}": ctx.attr._adb.label.package,
             "{{launcher_path}}": "{{}}/{{}}".format(
                 ctx.attr._launcher.label.package,
                 ctx.attr._launcher.label.name,
diff --git a/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/java_test.bzl.template b/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/java_test.bzl.template
new file mode 100644
index 0000000..dbfb2e3
--- /dev/null
+++ b/experiments/prepare_bazel_test_env/data/templates/build/bazel/rules/java_test.bzl.template
@@ -0,0 +1,94 @@
+# Copyright {year}, The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# WARNING: This BUILD file was generated by a tool.
+# It should not be manually modified.
+"""java_test implementation for the Android environment."""
+
+
+def _java_test_impl(ctx):
+    # Emit the launcher script.
+    script = ctx.actions.declare_file("%s.sh" % ctx.label.name)
+    ctx.actions.expand_template(
+        template=ctx.file._template,
+        output=script,
+        substitutions={{
+            "{{module_name}}":
+            ctx.label.name,
+            "{{module_path}}":
+            ctx.label.package,
+            "{{tradefed_launcher_module_path}}":
+            ctx.attr._tradefed_launcher.label.package,
+            "{{tradefed_jars_module_path}}":
+            ctx.attr._tradefed_jars.label.package,
+            "{{path_additions}}":
+            ctx.attr._adb.label.package,
+            "{{launcher_path}}":
+            "{{}}/{{}}".format(
+                ctx.attr._launcher.label.package,
+                ctx.attr._launcher.label.name,
+            ),
+        }},
+        is_executable=True,
+    )
+
+    # Pass the deps on as runfiles as Tradefed will scan the resulting
+    # directory for tests.
+    runfiles = ctx.runfiles(
+        files=ctx.files._launcher,
+        transitive_files=depset(transitive=[
+            depset(ctx.files.deps),
+            depset(ctx.files._adb),
+            depset(ctx.files._tradefed_launcher),
+            depset(ctx.files._tradefed_script_help),
+            depset(ctx.files._tradefed_jars),
+        ], ),
+    )
+
+    return [DefaultInfo(executable=script, runfiles=runfiles)]
+
+
+java_test = rule(
+    _java_test_impl,
+    attrs={{
+        "_adb":
+        attr.label(
+            default=Label("//packages/modules/adb"),
+            allow_single_file=True,
+        ),
+        "_tradefed_launcher":
+        attr.label(
+            default=Label("//tools/tradefederation/core:atest_tradefed"),
+            allow_single_file=True,
+        ),
+        "_tradefed_script_help":
+        attr.label(
+            default=Label("//tools/tradefederation/core:script_help"), ),
+        "_tradefed_jars":
+        attr.label(
+            default=Label("//tools/tradefederation/core:tradefed_lib"), ),
+        "_template":
+        attr.label(
+            default=Label(
+                "//build/bazel/rules:tf_test_executable.sh.template", ),
+            allow_single_file=True,
+        ),
+        "_launcher":
+        attr.label(default=Label("//build/bazel/rules:java_tf_test_launcher")),
+        "deps":
+        attr.label_list(allow_files=True),
+    }},
+    executable=True,
+    test=True,
+)