diff --git a/robotests/Android.bp b/robotests/Android.bp
new file mode 100644
index 0000000..b6a6f4e
--- /dev/null
+++ b/robotests/Android.bp
@@ -0,0 +1,13 @@
+//############################################################
+// KeyChain Robolectric test target.                         #
+//############################################################
+
+android_robolectric_test {
+    name: "KeyChainRoboTests",
+
+    srcs: ["src/**/*.java"],
+
+    java_resource_dirs: ["config"],
+
+    instrumentation_for: "KeyChain",
+}
diff --git a/robotests/Android.mk b/robotests/Android.mk
deleted file mode 100644
index 17358cd..0000000
--- a/robotests/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#############################################################
-# KeyChain Robolectric test target.                         #
-#############################################################
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := KeyChainRoboTests
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_RESOURCE_DIR := \
-    $(LOCAL_PATH)/res
-
-LOCAL_JAVA_RESOURCE_DIRS := config
-
-# Include the testing libraries
-LOCAL_JAVA_LIBRARIES := \
-    robolectric_android-all-stub \
-    Robolectric_all-target \
-    mockito-robolectric-prebuilt \
-    truth-prebuilt
-
-LOCAL_INSTRUMENTATION_FOR := KeyChain
-
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-#############################################################
-# KeyChain runner target to run the previous target.        #
-#############################################################
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := RunKeyChainRoboTests
-
-LOCAL_JAVA_LIBRARIES := \
-    KeyChainRoboTests \
-    robolectric_android-all-stub \
-    Robolectric_all-target \
-    mockito-robolectric-prebuilt \
-    truth-prebuilt
-
-LOCAL_TEST_PACKAGE := KeyChain
-
-LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src
-
-include external/robolectric-shadows/run_robotests.mk