Merge "Convert Android.mk file to Android.bp"
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..7aeaee5
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,19 @@
+// Copyright 2008 The Android Open Source Project
+// the custom dex'ed emma library ready to put on a device.
+// ============================================================
+java_library {
+    name: "emma",
+    srcs: [
+        "core/**/*.java",
+        "pregenerated/**/*.java",
+    ],
+    java_resource_dirs: [
+        "core/res",
+        "pregenerated/res",
+    ],
+    sdk_version: "9",
+    errorprone: {
+        javacflags: ["-Xep:MissingOverride:OFF"],
+    },
+    host_supported: true,
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index dc80a4a..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2008 The Android Open Source Project
-
-LOCAL_PATH := $(my-dir)
-
-
-# the custom dex'ed emma library ready to put on a device.
-# ============================================================
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, core pregenerated)
-
-LOCAL_MODULE := emma
-
-LOCAL_MODULE_TAGS := optional
-
-LOCAL_JAVA_RESOURCE_DIRS := core/res pregenerated/res
-
-LOCAL_SDK_VERSION := 9
-
-LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF
-
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-
-
-# the custom emma library to add to an SDK project.
-# ============================================================
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(call all-java-files-under, core pregenerated)
-
-LOCAL_MODULE := emmalib
-
-LOCAL_JAVA_RESOURCE_DIRS := core/res pregenerated/res
-
-LOCAL_ERROR_PRONE_FLAGS := -Xep:MissingOverride:OFF
-
-include $(BUILD_HOST_JAVA_LIBRARY)