Convert external/sqlite to Android.bp

See build/soong/README.md for more information.

Test: m -j checkbuild
Change-Id: I649eecd3948fbe49bb153b14a8eae9b110a79734

3 files changed, 32 insertions, 34 deletions

diff --git a/android/Android.bp b/android/Android.bp
new file mode 100644
index 0000000..7c17c6a
--- /dev/null
+++ b/android/Android.bp
@@ -0,0 +1,31 @@
+cc_library_static {
+    name: "libsqlite3_android",
+    host_supported: true,
+    srcs: [
+        "PhoneNumberUtils.cpp",
+        "OldPhoneNumberUtils.cpp",
+        "sqlite3_android.cpp",
+    ],
+    include_dirs: ["external/sqlite/dist"],
+    static_libs: ["liblog"],
+    shared_libs: [
+        "libicuuc",
+        "libicui18n",
+    ],
+    export_include_dirs: ["."],
+}
+
+//       The formal test for phone_number_compare() is in DataBaseGeneralTest.java
+//       (as of 2009-08-02), in which phone_number_compare() is tested via sqlite's custom
+//       function "PHONE_NUMBER_COMPARE".
+cc_test {
+    name: "libsqlite3_phone_number_utils_test",
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
+    srcs: [
+        "PhoneNumberUtils.cpp",
+        "PhoneNumberUtilsTest.cpp",
+    ],
+}
diff --git a/android/Android.mk b/android/Android.mk
deleted file mode 100644
index 9ba06c3..0000000
--- a/android/Android.mk
+++ /dev/null
@@ -1,33 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-
-libsqlite3_android_local_src_files := \
-	PhoneNumberUtils.cpp \
-	OldPhoneNumberUtils.cpp \
-	sqlite3_android.cpp
-
-libsqlite3_android_c_includes := external/sqlite/dist
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= $(libsqlite3_android_local_src_files)
-LOCAL_C_INCLUDES += $(libsqlite3_android_c_includes)
-LOCAL_STATIC_LIBRARIES := liblog
-LOCAL_SHARED_LIBRARIES := libicuuc libicui18n
-LOCAL_MODULE:= libsqlite3_android
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES:= $(libsqlite3_android_local_src_files)
-LOCAL_C_INCLUDES += $(libsqlite3_android_c_includes)
-LOCAL_STATIC_LIBRARIES := liblog
-LOCAL_SHARED_LIBRARIES := libicuuc libicui18n
-LOCAL_MODULE:= libsqlite3_android
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-#       The formal test for phone_number_compare() is in DataBaseGeneralTest.java
-#       (as of 2009-08-02), in which phone_number_compare() is tested via sqlite's custom
-#       function "PHONE_NUMBER_COMPARE".
-include $(CLEAR_VARS)
-LOCAL_MODULE:= libsqlite3_phone_number_utils_test
-LOCAL_CFLAGS += -Wall -Werror
-LOCAL_SRC_FILES := PhoneNumberUtils.cpp PhoneNumberUtilsTest.cpp
-include $(BUILD_NATIVE_TEST)
diff --git a/android/sqlite3_android.cpp b/android/sqlite3_android.cpp
index 7356f9d..4174a13 100644
--- a/android/sqlite3_android.cpp
+++ b/android/sqlite3_android.cpp
@@ -25,7 +25,7 @@
 #include <unicode/uiter.h>
 #include <unicode/ustring.h>
 #include <unicode/utypes.h>
-#include <cutils/log.h>
+#include <log/log.h>
 
 #include "sqlite3_android.h"
 #include "PhoneNumberUtils.h"