Skip to content

Build proot for x86_64 as well #20

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

Merged
syntaxerror247 merged 1 commit into from
Oct 5, 2026
Merged

Build proot for x86_64 as well #20

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
5 changes: 3 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@ jobs:
add-to-path: false

- name: Build proot
run: |
thirdparty/proot/build.sh
env:
ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
run: |
TARGET_ARCH=arm64-v8a TARGET_PREFIX=aarch64 thirdparty/proot/build.sh
TARGET_ARCH=x86_64 TARGET_PREFIX=x86_64 thirdparty/proot/build.sh
- name: Set up JDK
uses: actions/setup-java@v4
Expand Down
12 changes: 7 additions & 5 deletions thirdparty/proot/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

ANDROID_API="${ANDROID_API:-32}"
HOST_TAG="${HOST_TAG:-linux-x86_64}"
TARGET_ARCH="${TARGET_ARCH:-arm64-v8a}"
TARGET_PREFIX="${TARGET_PREFIX:-aarch64}"

TALLOC_VERSION="${TALLOC_VERSION:-2.4.3}"
TALLOC_SHA256="${TALLOC_SHA256:-dc46c40b9f46bb34dd97fe41f548b0e8b247b77a918576733c528e83abd854dd}"
Expand All @@ -19,7 +21,7 @@ if ! [ -e "$ANDROID_TOOLCHAIN" ]; then
exit 1
fi

ANDROID_CC="$ANDROID_TOOLCHAIN/aarch64-linux-android${ANDROID_API}-clang"
ANDROID_CC="$ANDROID_TOOLCHAIN/${TARGET_PREFIX}-linux-android${ANDROID_API}-clang"

if ! [ -e "$ANDROID_CC" ]; then
echo "ERROR: Unable to find Android C compiler at ${ANDROID_CC}" > /dev/stderr
Expand Down Expand Up @@ -87,11 +89,11 @@ popd > /dev/null
CPPFLAGS="-I$TALLOC_DIR/include" LDFLAGS="-L$TALLOC_DIR/lib" make -C "$PROOT_DIR/src" CC="$ANDROID_CC" CROSS_COMPILE="$ANDROID_TOOLCHAIN/llvm-" PROOT_UNBUNDLE_LOADER=1 HAS_LOADER_32BIT=1 V=1 proot \
|| die "Unable to build proot"

mkdir -p "$BUILD_DIR/bin/arm64-v8a"
mkdir -p "$BUILD_DIR/bin/$TARGET_ARCH"

cp "$PROOT_DIR/src/loader/loader" "$BUILD_DIR/bin/arm64-v8a/libproot-loader.so" \
cp "$PROOT_DIR/src/loader/loader" "$BUILD_DIR/bin/$TARGET_ARCH/libproot-loader.so" \
|| die "Unable to copy loader"
cp "$PROOT_DIR/src/loader/loader-m32" "$BUILD_DIR/bin/arm64-v8a/libproot-loader32.so" \
cp "$PROOT_DIR/src/loader/loader-m32" "$BUILD_DIR/bin/$TARGET_ARCH/libproot-loader32.so" \
|| die "Unable to copy loader32"
cp "$PROOT_DIR/src/proot" "$BUILD_DIR/bin/arm64-v8a/libproot.so" \
cp "$PROOT_DIR/src/proot" "$BUILD_DIR/bin/$TARGET_ARCH/libproot.so" \
|| die "Unable to copy proot"
Loading