summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSasha Smundak <asmundak@google.com>2019-01-15 11:29:22 -0800
committerandroid-build-merger <android-build-merger@google.com>2019-01-15 11:29:22 -0800
commit5c4d0b5819720117754c22289abb60906c03a4df (patch)
treeb35844196027573fe7793ec48cde4b350534b802
parent4cbf238a0393aeb57ce6cce5ebff94f5b407ae55 (diff)
parentfe4c9d4785a59ceef411d4faf12f7b87ded0c448 (diff)
downloademma-5c4d0b5819720117754c22289abb60906c03a4df.tar.gz
Merge "Convert Android.mk file to Android.bp" am: f852f1e355 am: 35d7bfafa2
am: fe4c9d4785 Change-Id: Iad698f93e489c8685840cae5267be6be2bd26f16
-rw-r--r--Android.bp19
-rw-r--r--Android.mk38
2 files changed, 19 insertions, 38 deletions
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)