[bazel] Fix Android gms and benchmark POC
Follow-up to https://skia-review.googlesource.com/c/skia/+/828537
Change-Id: Icbab3dd3bae10a4f3800f8205b7a9e187b4d1ee2
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/836017
Reviewed-by: Ravi Mistry <rmistry@google.com>
diff --git a/tools/testrunners/common/android/android_test.bzl b/tools/testrunners/common/android/android_test.bzl
index bacb1af..3706672 100644
--- a/tools/testrunners/common/android/android_test.bzl
+++ b/tools/testrunners/common/android/android_test.bzl
@@ -74,9 +74,7 @@
skia_cc_binary(
name = test_binary,
srcs = srcs,
- deps = deps + [
- "//tools/testrunners/unit:testrunner",
- ],
+ deps = deps,
testonly = True, # Needed to gain access to test-only files.
)
diff --git a/tools/testrunners/unit/android_unit_test.bzl b/tools/testrunners/unit/android_unit_test.bzl
index b68b89a..1793182 100644
--- a/tools/testrunners/unit/android_unit_test.bzl
+++ b/tools/testrunners/unit/android_unit_test.bzl
@@ -2,13 +2,16 @@
load("//tools/testrunners/common/android:android_test.bzl", "android_test")
-def android_unit_test(**kwargs):
+def android_unit_test(deps = [], **kwargs):
"""Defines an Android unit test.
This macro is just a wrapper around the android_test macro with the necessary defaults for
Android unit tests. See the android_test macro documentation for details.
Args:
+ deps: Dependencies for this test to run.
**kwargs: Any arguments to pass to the underlying android_test macro instance.
"""
- android_test(**kwargs)
+ android_test(deps = deps + [
+ "//tools/testrunners/unit:testrunner",
+ ], **kwargs)
