summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorSasha Smundak <asmundak@google.com>2019-01-10 12:27:01 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-01-10 12:27:01 -0800
commit539170792fe4dfabfdf2159c90257be99bd96aeb (patch)
treeaf7b361b310fe744059bb5d2b380035f96eac82b /tests
parentc06486fd87cc694719e2dff1b77f972038ce0be3 (diff)
parentec09e63567662e8dc2f16fe4d2df2c6d76dfe7bf (diff)
downloadandroid_packages_apps_CarrierConfig-539170792fe4dfabfdf2159c90257be99bd96aeb.tar.gz
android_packages_apps_CarrierConfig-539170792fe4dfabfdf2159c90257be99bd96aeb.tar.bz2
android_packages_apps_CarrierConfig-539170792fe4dfabfdf2159c90257be99bd96aeb.zip
Convert Android.mk file to Android.bp am: 5b31d0be95 am: 0c9616afec
am: ec09e63567 Change-Id: I7cad2ab0cd5717ccde8e18191246dfa12b06c81d
Diffstat (limited to 'tests')
-rw-r--r--tests/Android.bp13
-rw-r--r--tests/Android.mk18
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)