From 683a6b6fb60f9caab3dd4152ee6695051199b521 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Wed, 15 Aug 2018 13:42:38 -0700 Subject: Convert sqlite-jdbc to Android.bp See build/soong/README.md for more information. Test: m checkbuild Change-Id: Ibcbb246e62eedf93a6a843a0b98efe98b9b4af7b --- Android.bp | 7 +++++++ Android.mk | 18 ------------------ 2 files changed, 7 insertions(+), 18 deletions(-) delete mode 100644 Android.mk diff --git a/Android.bp b/Android.bp index bf66d5b..5ab4934 100644 --- a/Android.bp +++ b/Android.bp @@ -12,3 +12,10 @@ cc_library_shared { 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. -- cgit v1.2.3