Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1044702c authored by Jerome Gaillard's avatar Jerome Gaillard
Browse files

Add SQLite to libandroid_runtime for linux host 

This allows the possibility to use it with Layoutlib/Helium.

Test: lunch sdk && m libandroid_runtime
Change-Id: I93b1ebec968566aeb9209da607ce8a80489ed060
parent 67dd9ce1

core/jni/Android.bp

+6 −0
Original line number Original line Diff line number Diff line
@@ -303,6 +303,11 @@ cc_library_shared { 
        linux_glibc: {

        linux_glibc: {

            srcs: [

            srcs: [

                "android_content_res_ApkAssets.cpp",

                "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_hardware_input_InputApplicationHandle.cpp",

                "android_os_MessageQueue.cpp",

                "android_os_MessageQueue.cpp",

                "android_os_Parcel.cpp",

                "android_os_Parcel.cpp",
@@ -326,6 +331,7 @@ cc_library_shared { 
            static_libs: [

            static_libs: [

                "libinput",

                "libinput",

                "libbinderthreadstateutils",

                "libbinderthreadstateutils",

                "libsqlite",

            ],

            ],

            shared_libs: [

            shared_libs: [

                // libbinder needs to be shared since it has global state

                // libbinder needs to be shared since it has global state

core/jni/LayoutlibLoader.cpp

+9 −0
Original line number Original line Diff line number Diff line
@@ -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_StringBlock(JNIEnv* env);

extern int register_android_content_XmlBlock(JNIEnv* env);

extern int register_android_content_XmlBlock(JNIEnv* env);

extern int register_android_content_res_ApkAssets(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_FileObserver(JNIEnv* env);

extern int register_android_os_MessageQueue(JNIEnv* env);

extern int register_android_os_MessageQueue(JNIEnv* env);

extern int register_android_os_SystemClock(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__

#ifdef __linux__

        {"android.content.res.ApkAssets", REG_JNI(register_android_content_res_ApkAssets)},

        {"android.content.res.ApkAssets", REG_JNI(register_android_content_res_ApkAssets)},

        {"android.content.res.AssetManager", REG_JNI(register_android_content_AssetManager)},

        {"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

#endif

        {"android.content.res.StringBlock", REG_JNI(register_android_content_StringBlock)},

        {"android.content.res.StringBlock", REG_JNI(register_android_content_StringBlock)},

        {"android.content.res.XmlBlock", REG_JNI(register_android_content_XmlBlock)},

        {"android.content.res.XmlBlock", REG_JNI(register_android_content_XmlBlock)},

libs/androidfw/Android.bp

+5 −0
Original line number Original line Diff line number Diff line
@@ -96,6 +96,11 @@ cc_library { 
                "libz",

                "libz",

            ],

            ],

        },

        },

        linux_glibc: {

            srcs: [

                "CursorWindow.cpp",

            ],

        },

        windows: {

        windows: {

            enabled: true,

            enabled: true,

        },

        },