Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add SQLite to libandroid_runtime for linux host"

Browse Source
This commit is contained in:
Jerome Gaillard
2021-01-11 11:03:44 +00:00
committed by Android (Google) Code Review
parent 2ff321e6a2 1044702c35
commit 5da264a627
3 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/jni/Android.bp
View File

@@ -308,6 +308,11 @@ cc_library_shared {
linux_glibc: {
srcs: [
"android_content_res_ApkAssets.cpp",
"android_database_CursorWindow.cpp",
"android_database_SQLiteCommon.cpp",
"android_database_SQLiteConnection.cpp",
"android_database_SQLiteGlobal.cpp",
"android_database_SQLiteDebug.cpp",
"android_hardware_input_InputApplicationHandle.cpp",
"android_os_MessageQueue.cpp",
"android_os_Parcel.cpp",
@@ -331,6 +336,7 @@ cc_library_shared {
static_libs: [
"libinput",
"libbinderthreadstateutils",
"libsqlite",
],
shared_libs: [
// libbinder needs to be shared since it has global state

9
core/jni/LayoutlibLoader.cpp
View File

@@ -41,6 +41,10 @@ extern int register_android_content_AssetManager(JNIEnv* env);
extern int register_android_content_StringBlock(JNIEnv* env);
extern int register_android_content_XmlBlock(JNIEnv* env);
extern int register_android_content_res_ApkAssets(JNIEnv* env);
extern int register_android_database_CursorWindow(JNIEnv* env);
extern int register_android_database_SQLiteConnection(JNIEnv* env);
extern int register_android_database_SQLiteGlobal(JNIEnv* env);
extern int register_android_database_SQLiteDebug(JNIEnv* env);
extern int register_android_os_FileObserver(JNIEnv* env);
extern int register_android_os_MessageQueue(JNIEnv* env);
extern int register_android_os_SystemClock(JNIEnv* env);
@@ -65,6 +69,11 @@ static const std::unordered_map<std::string, RegJNIRec> gRegJNIMap = {
#ifdef __linux__
{"android.content.res.ApkAssets", REG_JNI(register_android_content_res_ApkAssets)},
{"android.content.res.AssetManager", REG_JNI(register_android_content_AssetManager)},
{"android.database.CursorWindow", REG_JNI(register_android_database_CursorWindow)},
{"android.database.sqlite.SQLiteConnection",
REG_JNI(register_android_database_SQLiteConnection)},
{"android.database.sqlite.SQLiteGlobal", REG_JNI(register_android_database_SQLiteGlobal)},
{"android.database.sqlite.SQLiteDebug", REG_JNI(register_android_database_SQLiteDebug)},
#endif
{"android.content.res.StringBlock", REG_JNI(register_android_content_StringBlock)},
{"android.content.res.XmlBlock", REG_JNI(register_android_content_XmlBlock)},

5
libs/androidfw/Android.bp
View File

@@ -100,6 +100,11 @@ cc_library {
"libz",
],
},
linux_glibc: {
srcs: [
"CursorWindow.cpp",
],
},
windows: {
enabled: true,
},