diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..fa2fb50
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,39 @@
+//
+// Copyright (C) 2008 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.
+//
+
+android_app {
+    name: "CalendarProvider",
+    static_libs: [
+        "guava",
+        "android-common",
+        "calendar-common",
+    ],
+    srcs: [
+        "src/**/*.java",
+        "src/com/android/providers/calendar/EventLogTags.logtags",
+    ],
+    platform_apis: true,
+    privileged: true,
+
+    // The Jacoco tool analyzes code coverage when running unit tests on the
+    // application. This configuration line selects which packages will be analyzed,
+    // leaving out code which is tested by other means (e.g. static libraries) that
+    // would dilute the coverage results. These options do not affect regular
+    // production builds.
+    jacoco: {
+        include_filter: ["com.android.providers.calendar.*"],
+    },
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 2366174..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-#
-# Copyright (C) 2008 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.
-#
-LOCAL_PATH := $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_STATIC_JAVA_LIBRARIES := guava \
-        android-common \
-        calendar-common
-
-LOCAL_SRC_FILES := $(call all-java-files-under,src)
-LOCAL_SRC_FILES += \
-        src/com/android/providers/calendar/EventLogTags.logtags
-
-LOCAL_PACKAGE_NAME := CalendarProvider
-LOCAL_PRIVATE_PLATFORM_APIS := true
-
-LOCAL_PRIVILEGED_MODULE := true
-
-# The Jacoco tool analyzes code coverage when running unit tests on the
-# application. This configuration line selects which packages will be analyzed,
-# leaving out code which is tested by other means (e.g. static libraries) that
-# would dilute the coverage results. These options do not affect regular
-# production builds.
-LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.providers.calendar.*
-
-include $(BUILD_PACKAGE)
-
-# Use the following include to make our test apk.
-include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/Android.bp b/tests/Android.bp
new file mode 100644
index 0000000..1528d4a
--- /dev/null
+++ b/tests/Android.bp
@@ -0,0 +1,18 @@
+android_test {
+    name: "CalendarProviderTests",
+    // Include all test java files.
+    srcs: ["src/**/*.java"],
+    platform_apis: true,
+    test_suites: ["device-tests"],
+    static_libs: [
+        "calendar-common",
+        "junit",
+    ],
+    libs: [
+        "ext",
+        "android.test.runner",
+        "android.test.base",
+        "android.test.mock",
+    ],
+    instrumentation_for: "CalendarProvider",
+}
diff --git a/tests/Android.mk b/tests/Android.mk
deleted file mode 100644
index 88b228c..0000000
--- a/tests/Android.mk
+++ /dev/null
@@ -1,25 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-# We only want this apk build for tests.
-LOCAL_MODULE_TAGS := tests
-
-# Include all test java files.
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-
-LOCAL_PACKAGE_NAME := CalendarProviderTests
-LOCAL_PRIVATE_PLATFORM_APIS := true
-LOCAL_COMPATIBILITY_SUITE := device-tests
-
-LOCAL_STATIC_JAVA_LIBRARIES := calendar-common junit
-
-LOCAL_JAVA_LIBRARIES := \
-    ext \
-    android.test.runner \
-    android.test.base \
-    android.test.mock \
-
-
-LOCAL_INSTRUMENTATION_FOR := CalendarProvider
-
-include $(BUILD_PACKAGE)