* ci.yml:

- Build libotf to build-android. - mlterm-android/jni -> mlterm-android/app/src/main/jni
arakiken · Jan 28, 2025 · 18ab6a9 · 18ab6a9
1 parent ea70130
commit 18ab6a9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -66,22 +66,25 @@ jobs:
           CLANG_ARMV7A=`ls $ANDROID_NDK_HOME/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi*-clang|tail -n 1`
           curl -L -O https://github.com/fribidi/fribidi/releases/download/0.19.7/fribidi-0.19.7.tar.bz2
           tar xvf fribidi-0.19.7.tar.bz2
-          (cd fribidi-0.19.7; CC="$CLANG_ARMV7A -fPIC" ./configure --host=armv7a-linux-androideabi; mkdir -p $HOME/mlterm-android/jni/fribidi; cp `find . -name *.[chi]` $HOME/mlterm-android/jni/fribidi)
+          (cd fribidi-0.19.7; CC="$CLANG_ARMV7A -fPIC" ./configure --host=armv7a-linux-androideabi; mkdir -p $HOME/mlterm-android/app/src/main/jni/fribidi; cp `find . -name *.[chi]` $HOME/mlterm-android/app/src/main/jni/fribidi)
+          curl -L -O https://download.savannah.nongnu.org/releases/m17n/libotf-0.9.16.tar.gz
+          tar xvf libotf-0.9.16.tar.gz
+          (cd libotf-0.9.16; CC="$CLANG_ARMV7A -fPIC" ./configure --host=armv7a-linux-androideabi; mkdir -p $HOME/mlterm-android/app/src/main/jni/libotf; cp `find . -name *.[ch]` $HOME/mlterm-android/app/src/main/jni/libotf)
           curl -L -O https://download.savannah.gnu.org/releases/freetype/freetype-2.13.3.tar.gz
           tar xvf freetype-2.13.3.tar.gz
-          (cd freetype-2.13.3; sh ./autogen.sh; CC="$CLANG_ARMV7A -fPIC" ./configure --host=armv7a-linux-androideabi --disable-shared --with-png=no --with-harfbuzz=no --with-bzip2=no --with-brotli=no --prefix=$HOME/mlterm-android/jni/freetype/armeabi-v7a; make; make install)
+          (cd freetype-2.13.3; sh ./autogen.sh; CC="$CLANG_ARMV7A -fPIC" ./configure --host=armv7a-linux-androideabi --disable-shared --with-png=no --with-harfbuzz=no --with-bzip2=no --with-brotli=no --prefix=$HOME/mlterm-android/app/src/main/jni/freetype/armeabi-v7a; make; make install)
           curl -L -O https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-4.0.0.tar.gz
           tar xvf libressl-4.0.0.tar.gz
           (cd libressl-4.0.0; CC="$CLANG_ARMV7A -fPIC" ./configure --host=armv7a-linux-androideabi --disable-shared --prefix=$HOME/libressl; make; make install)
           curl -L -O https://libssh2.org/download/libssh2-1.11.1.tar.gz
           tar xvf libssh2-1.11.1.tar.gz
-          (cd libssh2-1.11.1; CC="$CLANG_ARMV7A -fPIC" ./configure --host=armv7a-linux-androideabi --disable-shared --prefix=$HOME/mlterm-android/jni/libssh2/armeabi-v7a --with-libssl-prefix=$HOME/libressl; make; make install)
+          (cd libssh2-1.11.1; CC="$CLANG_ARMV7A -fPIC" ./configure --host=armv7a-linux-androideabi --disable-shared --prefix=$HOME/mlterm-android/app/src/main/jni/libssh2/armeabi-v7a --with-libssl-prefix=$HOME/libressl; make; make install)
           curl -L -O https://github.com/protocolbuffers/protobuf/releases/download/v3.20.1/protobuf-cpp-3.20.1.tar.gz
           tar xvf protobuf-cpp-3.20.1.tar.gz
-          (cd protobuf-3.20.1; CC="$CLANG_ARMV7A -fPIC" CXX="${CLANG_ARMV7A}++ -fPIC" ./configure --host=armv7a-linux-androideabi --disable-shared --prefix=$HOME/mlterm-android/jni/protobuf/armeabi-v7a; make; make install)
+          (cd protobuf-3.20.1; CC="$CLANG_ARMV7A -fPIC" CXX="${CLANG_ARMV7A}++ -fPIC" ./configure --host=armv7a-linux-androideabi --disable-shared --prefix=$HOME/mlterm-android/app/src/main/jni/protobuf/armeabi-v7a; make; make install)
           curl -L -O https://github.com/arakiken/mosh/archive/refs/heads/sixel-winsock.zip
           unzip sixel-winsock.zip
-          (cd mosh-sixel-winsock; autoconf; PATH=$HOME/mlterm-android/jni/protobuf/armeabi-v7a/bin:$PATH PKG_CONFIG_PATH=$HOME/libressl/lib/pkgconfig:$HOME/mlterm-android/jni/protobuf/armeabi-v7a/lib/pkgconfig:$PKG_CONFIG_PATH CC="$CLANG_ARMV7A -fPIC -L$HOME/libressl/lib" CXX="${CLANG_ARMV7A}++ -fPIC -L$HOME/libressl/lib" ./configure --host=armv7a-linux-androideabi)
+          (cd mosh-sixel-winsock; autoconf; PATH=$HOME/mlterm-android/app/src/main/jni/protobuf/armeabi-v7a/bin:$PATH PKG_CONFIG_PATH=$HOME/libressl/lib/pkgconfig:$HOME/mlterm-android/app/src/main/jni/protobuf/armeabi-v7a/lib/pkgconfig:$PKG_CONFIG_PATH CC="$CLANG_ARMV7A -fPIC -L$HOME/libressl/lib" CXX="${CLANG_ARMV7A}++ -fPIC -L$HOME/libressl/lib" ./configure --host=armv7a-linux-androideabi)
           (cd android; ./prepare-gradle.sh $HOME/mlterm-android $PWD/../mosh-sixel-winsock $HOME/libressl 8.8.0)
           (cd $HOME/mlterm-android; ./build-gradle.sh)
           mkdir dist; cp `find $HOME/mlterm-android -name *.apk` dist

diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,9 @@
+2025-01-28  Araki Ken  <arakiken@users.sf.net>
+
+	* ci.yml:
+	  - Build libotf to build-android.
+	  - mlterm-android/jni -> mlterm-android/app/src/main/jni
+
 2025-01-26  Araki Ken  <arakiken@users.sf.net>
 
 	* ci.yml: Build fribidi, freetype2, libressl and libssh2.