Skip to content

Commit c64862f

Browse files
committed
Build native code from source in Android builds (requires IL2CPP)
1 parent 6e75479 commit c64862f

21 files changed

+18
-494
lines changed

Plugins/Makefile

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
# Android setup
2-
ANDROID_NDK_ROOT ?=
31
# macOS code signing setup
42
CODESIGN ?= codesign
53
MACOS_CODESIGN_SIGNATURE ?=
@@ -58,22 +56,6 @@ ifdef MACOS_CODESIGN_SIGNATURE
5856
$(CODESIGN) -s "$(MACOS_CODESIGN_SIGNATURE)" $@
5957
endif
6058

61-
# Android
62-
check-ndk-root:
63-
ifndef ANDROID_NDK_ROOT
64-
$(error ANDROID_NDK_ROOT must be set for Android builds!)
65-
endif
66-
67-
lib/android/%/libgilzoide-sqlite-net.so: CFLAGS += -fPIC
68-
lib/android/%/libgilzoide-sqlite-net.so: LINKFLAGS += -shared -lm -Wl,-z,max-page-size=16384
69-
lib/android/%/libgilzoide-sqlite-net.so: lib/android/%/sqlite3.o~ check-ndk-root | lib/android/%
70-
$(CC) -o $@ $< $(LINKFLAGS)
71-
72-
lib/android/arm64/libgilzoide-sqlite-net.so: CC = $(wildcard $(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/*/bin/aarch64-linux-android21-clang)
73-
lib/android/arm32/libgilzoide-sqlite-net.so: CC = $(wildcard $(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/*/bin/armv7a-linux-androideabi21-clang)
74-
lib/android/x86_64/libgilzoide-sqlite-net.so: CC = $(wildcard $(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/*/bin/x86_64-linux-android21-clang)
75-
lib/android/x86/libgilzoide-sqlite-net.so: CC = $(wildcard $(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/*/bin/i686-linux-android21-clang)
76-
7759

7860
# Source
7961
$(SQLITE_NET_DEST)/%.cs: sqlite-net~/src/%.cs $(SQLITE_NET_SED_SCRIPT)
@@ -103,11 +85,6 @@ linux-x86_64: lib/linux/x86_64/libgilzoide-sqlite-net.so
10385

10486
macos-universal: lib/macos/libgilzoide-sqlite-net.dylib
10587

106-
android-arm64: lib/android/arm64/libgilzoide-sqlite-net.so
107-
android-arm32: lib/android/arm32/libgilzoide-sqlite-net.so
108-
android-x86_64: lib/android/x86_64/libgilzoide-sqlite-net.so
109-
android-x86: lib/android/x86/libgilzoide-sqlite-net.so
110-
11188
source: $(SQLITE_NET_DEST)/License.txt $(SQLITE_NET_DEST)/AssemblyInfo.cs $(SQLITE_NET_DEST)/SQLite.cs $(SQLITE_NET_DEST)/SQLiteAsync.cs
11289

11390
all-android: android-arm64 android-arm32 android-x86_64 android-x86
@@ -118,9 +95,6 @@ all-windows-mingw: windows-mingw-x86_64 windows-mingw-x86
11895
all-windows-llvm-mingw: windows-mingw-x86_64 windows-mingw-x86 windows-mingw-arm64
11996

12097
# Dockerized builds
121-
docker-all-android:
122-
docker build -f tools~/Dockerfile.build.android --platform=linux/amd64 -t gilzoide-sqlite-net-build-android:latest $(DOCKER_BUILD_ARGS) .
123-
docker run --rm -v "$(CURDIR)":/src -w /src --platform=linux/amd64 gilzoide-sqlite-net-build-android:latest make all-android
12498
docker-all-linux:
12599
docker build -f tools~/Dockerfile.build.linux --platform=linux/amd64 -t gilzoide-sqlite-net-build-linux:latest $(DOCKER_BUILD_ARGS) .
126100
docker run --rm -v "$(CURDIR)":/src -w /src --platform=linux/amd64 gilzoide-sqlite-net-build-linux:latest make all-linux
@@ -136,6 +110,5 @@ download-latest-build:
136110
$(GITHUB_CLI_BIN) run download $(RUN_ID) --repo $(GITHUB_REPO) -p gilzoide-sqlite-net-* -D $(TMPDIR)
137111
rsync -r $(TMPDIR)/gilzoide-sqlite-net-windows/* lib/windows/
138112
rsync -r $(TMPDIR)/gilzoide-sqlite-net-linux/* lib/linux/
139-
rsync -r $(TMPDIR)/gilzoide-sqlite-net-android/* lib/android/
140113
rsync -r $(TMPDIR)/gilzoide-sqlite-net-macos/* lib/macos/
141114
$(RM) -r $(TMPDIR)

Plugins/lib/android.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

Plugins/lib/android/arm32.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.
Binary file not shown.

Plugins/lib/android/arm32/libgilzoide-sqlite-net.so.meta

Lines changed: 0 additions & 101 deletions
This file was deleted.

Plugins/lib/android/arm64.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.
Binary file not shown.

Plugins/lib/android/arm64/libgilzoide-sqlite-net.so.meta

Lines changed: 0 additions & 101 deletions
This file was deleted.

Plugins/lib/android/x86.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.
Binary file not shown.

0 commit comments

Comments
 (0)