Break the sqlite JDBC driver out from our JDBC implementation.
The JDBC driver is from a different source
(http://www.ch-werner.de/javasqlite/overview-summary.html) and is only
really needed for testing.
Bug 2468870 asks that we don't eagerly register the native methods for
these classes. That bug is fixed by this change.
Bug 2198667 asks that we stop shipping this JDBC driver as part of the
base system. That bug is not addressed by this change: the classes and
native code are now in their own, separate, .jar and .so files -- so
they'll be easier to remove in future -- but for now those files are
still in /system/framework and /system/lib respectively.
Bug: 2468870
Bug: 2198667
diff --git a/Register.c b/Register.c
index 33bee4e..338efc2 100644
--- a/Register.c
+++ b/Register.c
@@ -100,17 +100,6 @@
if (register_com_ibm_icu4jni_util_Resources(env) != 0)
goto bail;
- if (register_SQLite_Database(env) != 0)
- goto bail;
- if (register_SQLite_Vm(env) != 0)
- goto bail;
- if (register_SQLite_FunctionContext(env) != 0)
- goto bail;
- if (register_SQLite_Stmt(env) != 0)
- goto bail;
- if (register_SQLite_Blob(env) != 0)
- goto bail;
-
/*
* Initialize the Android classes last, as they have dependencies
* on the "corer" core classes.
diff --git a/include/nativehelper/AndroidSystemNatives.h b/include/nativehelper/AndroidSystemNatives.h
index 28b9c8c..da15170 100644
--- a/include/nativehelper/AndroidSystemNatives.h
+++ b/include/nativehelper/AndroidSystemNatives.h
@@ -87,14 +87,6 @@
int register_com_ibm_icu4jni_regex_NativeRegEx(JNIEnv* env);
int register_com_ibm_icu4jni_util_Resources(JNIEnv* env);
-int register_sun_misc_Unsafe(JNIEnv* env);
-
-int register_SQLite_Database(JNIEnv* env);
-int register_SQLite_Vm(JNIEnv* env);
-int register_SQLite_FunctionContext(JNIEnv* env);
-int register_SQLite_Stmt(JNIEnv* env);
-int register_SQLite_Blob(JNIEnv* env);
-
int register_org_openssl_NativeBN(JNIEnv* env);
#ifdef __cplusplus
