2 files changed, 13 insertions, 18 deletions
diff --git a/tests/Android.bp b/tests/Android.bp
new file mode 100644
index 0000000..ab824d3
--- /dev/null
+++ b/tests/Android.bp
@@ -0,0 +1,13 @@
+android_test {
+    name: "CarrierConfigTests",
+    libs: [
+        "android.test.runner",
+        "android.test.base",
+    ],
+    static_libs: ["junit"],
+    srcs: ["src/**/*.java"],
+    platform_apis: true,
+    test_suites: ["device-tests"],
+    certificate: "platform",
+    instrumentation_for: "CarrierConfig",
+}
diff --git a/tests/Android.mk b/tests/Android.mk
deleted file mode 100644
index 44ffd32..0000000
--- a/tests/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := tests
-
-LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base
-LOCAL_STATIC_JAVA_LIBRARIES := junit
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := CarrierConfigTests
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_COMPATIBILITY_SUITE := device-tests
-LOCAL_CERTIFICATE := platform
-
-LOCAL_INSTRUMENTATION_FOR := CarrierConfig
-
-include $(BUILD_PACKAGE)