Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Re-enable math functions #17

Merged
merged 1 commit into from
Aug 9, 2023
Merged

Re-enable math functions #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bld/android/jni/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_MODULE := libe_sqlite3
LOCAL_MODULE_FILENAME := libe_sqlite3
LOCAL_CFLAGS := -O -DNDEBUG -DSQLITE_TEMP_STORE=3 -DSQLITE_DEFAULT_FOREIGN_KEYS=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_RTREE -DSQLITE_OS_UNIX
LOCAL_CFLAGS := -O -DNDEBUG -DSQLITE_TEMP_STORE=3 -DSQLITE_DEFAULT_FOREIGN_KEYS=1 -DSQLITE_ENABLE_FTS3_PARENTHESIS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_COLUMN_METADATA -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_RTREE -DSQLITE_OS_UNIX
LOCAL_SRC_FILES = ../../../sqlite3/sqlite3.c

include $(BUILD_SHARED_LIBRARY)
Expand Down
2 changes: 1 addition & 1 deletion bld/android/project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-14
target=android-21
Copy link
Contributor Author

@bricelam bricelam Jul 25, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like log2 wasn't added until version 18 for arm/x86 and 21 for arm64/x64.

Copy link
Contributor Author

@bricelam bricelam Jul 25, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMHO, this should be an acceptable requirement bump. For comparison:

Framework Min Android
.NET 6 21
MAUI 21
MAUI Blazor 24
Unity 22
Xamarin 23 (recommended, not required)

4 changes: 2 additions & 2 deletions bld/cb.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ IList<string> libs
var dest_project_properties = Path.Combine(dest_dir, "project.properties");
using (TextWriter tw = new StreamWriter(dest_project_properties))
{
tw.Write("target=android-14\n");
tw.Write("target=android-21\n");
}
}

Expand Down Expand Up @@ -1196,7 +1196,7 @@ static void add_basic_sqlite3_defines(Dictionary<string,string> defines)
defines["SQLITE_ENABLE_FTS4"] = null;
defines["SQLITE_ENABLE_FTS5"] = null;
defines["SQLITE_ENABLE_JSON1"] = null;
//defines["SQLITE_ENABLE_MATH_FUNCTIONS"] = null;
defines["SQLITE_ENABLE_MATH_FUNCTIONS"] = null;
defines["SQLITE_ENABLE_RTREE"] = null;
defines["SQLITE_ENABLE_SNAPSHOT"] = null;
defines["SQLITE_DEFAULT_FOREIGN_KEYS"] = "1";
Expand Down
Loading