Skip to content

Commit 5d4b3bd

Browse files
Fix Android
1 parent 01ab5d2 commit 5d4b3bd

File tree

6 files changed

+45
-5
lines changed

6 files changed

+45
-5
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,4 +297,4 @@ jobs:
297297
- name: Run build
298298
run: |
299299
source android/android_env.sh ${{ matrix.arch }}
300-
ceedling --mixin=android release --verbosity=debug
300+
ceedling --mixin=android-${{ matrix.arch }} release --verbosity=debug

android/android_env.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,6 @@ CONFIG_OPTS=()
7171
CONFIG_OPTS+=("--host=${CHOST}")
7272
CONFIG_OPTS+=($ARCH_OPTS)
7373

74+
export PATH=${TOOLCHAIN}:$PATH
75+
7476
export CROSS_OPTS=${CONFIG_OPTS[@]}

ceedling/android.yml renamed to ceedling/android-arm64-v8a.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,5 @@
1010
:tools:
1111
:test_compiler:
1212
:executable: aarch64-linux-android21-clang
13-
:test_linker:
14-
:executable: aarch64-linux-android21-clang
1513
:release_compiler:
1614
:executable: aarch64-linux-android21-clang
17-
:release_linker:
18-
:executable: aarch64-linux-android21-clang

ceedling/android-armeabi-v7a.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
--- # ceedling project file for android
2+
3+
:environment:
4+
- :HE_WOLFSSL_ADDL_CONF_FLAGS: >-
5+
--disable-crypttests #{ENV['CROSS_OPTS']}
6+
- :HE_PLATFORM_CFLAGS: -DFP_MAX_BITS=8192 -fomit-frame-pointer
7+
- :LIBS: -llog -landroid
8+
9+
10+
:tools:
11+
:test_compiler:
12+
:executable: armv7a-linux-androideabi21-clang
13+
:release_compiler:
14+
:executable: armv7a-linux-androideabi21-clang

ceedling/android-x86.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
--- # ceedling project file for android
2+
3+
:environment:
4+
- :HE_WOLFSSL_ADDL_CONF_FLAGS: >-
5+
--disable-crypttests #{ENV['CROSS_OPTS']}
6+
- :HE_PLATFORM_CFLAGS: -DFP_MAX_BITS=8192 -fomit-frame-pointer
7+
- :LIBS: -llog -landroid
8+
9+
10+
:tools:
11+
:test_compiler:
12+
:executable: i686-linux-android21-clang
13+
:release_compiler:
14+
:executable: i686-linux-android21-clang

ceedling/android-x86_64.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
--- # ceedling project file for android
2+
3+
:environment:
4+
- :HE_WOLFSSL_ADDL_CONF_FLAGS: >-
5+
--disable-crypttests #{ENV['CROSS_OPTS']}
6+
- :HE_PLATFORM_CFLAGS: -DFP_MAX_BITS=8192 -fomit-frame-pointer
7+
- :LIBS: -llog -landroid
8+
9+
10+
:tools:
11+
:test_compiler:
12+
:executable: x86_64-linux-android21-clang
13+
:release_compiler:
14+
:executable: x86_64-linux-android21-clang

0 commit comments

Comments
 (0)