Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -546,7 +546,7 @@ jobs:
arch: x86_64
api-level: 30
target: google_apis
ndk: 25.1.8937393
ndk: 27.3.13750724
emulator-options: -no-window -noaudio -no-boot-anim -camera-back none -port 5554
emulator-boot-timeout: 900
script: |
Expand All @@ -559,13 +559,13 @@ jobs:
arch: x86_64
api-level: 30
target: google_apis
ndk: 25.1.8937393
ndk: 27.3.13750724
emulator-options: -no-snapshot-save -no-window -noaudio -no-boot-anim -camera-back none -port 5554
emulator-boot-timeout: 900
script: |
adb wait-for-device
adb root
NDK=/usr/local/lib/android/sdk/ndk/25.1.8937393 builds/install/arch-specific/android/BuildFinalPackage.sh $ARCH
NDK=/usr/local/lib/android/sdk/ndk/27.3.13750724 builds/install/arch-specific/android/BuildFinalPackage.sh $ARCH

- name: Upload installer
uses: actions/upload-artifact@v4
Expand Down
6 changes: 3 additions & 3 deletions builds/posix/make.android.arm64
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ endif

NDK_TOOLCHAIN ?= $(NDK)/toolchains/llvm/prebuilt/linux-x86_64

CROSS_PREFIX24:=$(NDK_TOOLCHAIN)/bin/aarch64-linux-android24-
CROSS_PREFIX29:=$(NDK_TOOLCHAIN)/bin/aarch64-linux-android29-
CROSS_PREFIX:=$(NDK_TOOLCHAIN)/bin/llvm-

CROSS_FLAGS:=-I$(ROOT)/gen/cross

CXX:=$(CROSS_PREFIX24)clang++
CC:=$(CROSS_PREFIX24)clang
CXX:=$(CROSS_PREFIX29)clang++
CC:=$(CROSS_PREFIX29)clang
AR:=$(CROSS_PREFIX)ar
AS:=$(CROSS_PREFIX)as
LD:=$(CROSS_PREFIX)ld
Expand Down
6 changes: 3 additions & 3 deletions builds/posix/make.android.arme
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ endif

NDK_TOOLCHAIN ?= $(NDK)/toolchains/llvm/prebuilt/linux-x86_64

CROSS_PREFIX24:=$(NDK_TOOLCHAIN)/bin/armv7a-linux-androideabi24-
CROSS_PREFIX29:=$(NDK_TOOLCHAIN)/bin/armv7a-linux-androideabi29-
CROSS_PREFIX:=$(NDK_TOOLCHAIN)/bin/llvm-

CROSS_FLAGS:=-I$(ROOT)/gen/cross

CXX:=$(CROSS_PREFIX24)clang++
CC:=$(CROSS_PREFIX24)clang
CXX:=$(CROSS_PREFIX29)clang++
CC:=$(CROSS_PREFIX29)clang
AR:=$(CROSS_PREFIX)ar
AS:=$(CROSS_PREFIX)as
LD:=$(CROSS_PREFIX)ld
Expand Down
6 changes: 3 additions & 3 deletions builds/posix/make.android.x86
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ endif

NDK_TOOLCHAIN ?= $(NDK)/toolchains/llvm/prebuilt/linux-x86_64

CROSS_PREFIX24:=$(NDK_TOOLCHAIN)/bin/i686-linux-android24-
CROSS_PREFIX29:=$(NDK_TOOLCHAIN)/bin/i686-linux-android29-
CROSS_PREFIX:=$(NDK_TOOLCHAIN)/bin/llvm-

CROSS_FLAGS:=-I$(ROOT)/gen/cross

CXX:=$(CROSS_PREFIX24)clang++
CC:=$(CROSS_PREFIX24)clang
CXX:=$(CROSS_PREFIX29)clang++
CC:=$(CROSS_PREFIX29)clang
AR:=$(CROSS_PREFIX)ar
AS:=$(CROSS_PREFIX)as
LD:=$(CROSS_PREFIX)ld
Expand Down
6 changes: 3 additions & 3 deletions builds/posix/make.android.x86_64
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ endif

NDK_TOOLCHAIN ?= $(NDK)/toolchains/llvm/prebuilt/linux-x86_64

CROSS_PREFIX24:=$(NDK_TOOLCHAIN)/bin/x86_64-linux-android24-
CROSS_PREFIX29:=$(NDK_TOOLCHAIN)/bin/x86_64-linux-android29-
CROSS_PREFIX:=$(NDK_TOOLCHAIN)/bin/llvm-

CROSS_FLAGS:=-I$(ROOT)/gen/cross

CXX:=$(CROSS_PREFIX24)clang++
CC:=$(CROSS_PREFIX24)clang
CXX:=$(CROSS_PREFIX29)clang++
CC:=$(CROSS_PREFIX29)clang
AR:=$(CROSS_PREFIX)ar
AS:=$(CROSS_PREFIX)as
LD:=$(CROSS_PREFIX)ld
Expand Down
4 changes: 2 additions & 2 deletions extern/icu/android/aarch64/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
CFLAGS='-Os' \
CXXFLAGS='--std=c++17' \
LDFLAGS='-static-libstdc++ -Wl,-rpath=\$$ORIGIN' \
CC=aarch64-linux-android24-clang \
CXX=aarch64-linux-android24-clang++ \
CC=aarch64-linux-android29-clang \
CXX=aarch64-linux-android29-clang++ \
AR=llvm-ar \
RANLIB=llvm-ranlib \
--with-data-packaging=archive
4 changes: 2 additions & 2 deletions extern/icu/android/armv7a/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
CFLAGS='-Os -march=armv7-a -mfloat-abi=softfp -mfpu=neon' \
CXXFLAGS='--std=c++17 -march=armv7-a -mfloat-abi=softfp -mfpu=neon' \
LDFLAGS='-static-libstdc++ -march=armv7-a -Wl,--fix-cortex-a8 -Wl,-rpath=\$$ORIGIN' \
CC=armv7a-linux-androideabi24-clang \
CXX=armv7a-linux-androideabi24-clang++ \
CC=armv7a-linux-androideabi29-clang \
CXX=armv7a-linux-androideabi29-clang++ \
AR=llvm-ar \
RANLIB=llvm-ranlib \
--with-data-packaging=archive
4 changes: 2 additions & 2 deletions extern/icu/android/i686/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
CFLAGS='-Os' \
CXXFLAGS='--std=c++17' \
LDFLAGS='-static-libstdc++ -Wl,-rpath=\$$ORIGIN' \
CC=i686-linux-android24-clang \
CXX=i686-linux-android24-clang++ \
CC=i686-linux-android29-clang \
CXX=i686-linux-android29-clang++ \
AR=llvm-ar \
RANLIB=llvm-ranlib \
--with-data-packaging=archive
4 changes: 2 additions & 2 deletions extern/icu/android/x86_64/config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
CFLAGS='-Os' \
CXXFLAGS='--std=c++17' \
LDFLAGS='-static-libstdc++ -Wl,-rpath=\$$ORIGIN' \
CC=x86_64-linux-android24-clang \
CXX=x86_64-linux-android24-clang++ \
CC=x86_64-linux-android29-clang \
CXX=x86_64-linux-android29-clang++ \
AR=llvm-ar \
RANLIB=llvm-ranlib \
--with-data-packaging=archive
Binary file modified extern/icu/icu_android.tar.xz
Binary file not shown.
Loading