Merge "Convert sqlite-jdbc to Android.bp"
diff --git a/Android.bp b/Android.bp
index bf66d5b..5ab4934 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,3 +12,10 @@
sdk_version: "23",
}
+
+java_library {
+ name: "sqlite-jdbc",
+ hostdex: true,
+ srcs: ["src/main/java/**/*.java"],
+ sdk_version: "core_current",
+}
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 5b7ef64..0000000
--- a/Android.mk
+++ /dev/null
@@ -1,18 +0,0 @@
-# -*- mode: makefile -*-
-
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under,src/main/java)
-LOCAL_SDK_VERSION := core_current
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := sqlite-jdbc
-include $(BUILD_STATIC_JAVA_LIBRARY)
-
-ifeq ($(HOST_OS),linux)
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-java-files-under,src/main/java)
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := sqlite-jdbc-host
-include $(BUILD_HOST_DALVIK_STATIC_JAVA_LIBRARY)
-endif # HOST_OS == linux.
