diff options
| author | Colin Cross <ccross@android.com> | 2018-08-17 09:32:48 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-08-17 09:32:48 -0700 |
| commit | a99ce398c384df853af7a956baab4d3659775929 (patch) | |
| tree | c36a3fcf5520e484ac93dd012300c1ac1ed9ce05 | |
| parent | 8ece4e2b6edb941592f72cc811d04425aad5c170 (diff) | |
| parent | 1d4bbd7d4b03df45428f69e9aeefef72be623c77 (diff) | |
| download | javasqlite-a99ce398c384df853af7a956baab4d3659775929.tar.gz | |
Merge "Convert sqlite-jdbc to Android.bp" am: 9625acf19e am: 3fda6b7ab8
am: 1d4bbd7d4b
Change-Id: Ia711486c638112fcea6e09b38791dab13edc011e
| -rw-r--r-- | Android.bp | 7 | ||||
| -rw-r--r-- | Android.mk | 18 |
2 files changed, 7 insertions, 18 deletions
@@ -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. |