Skip to content

Commit 23c0dcd

Browse files
fix: attempt to fix env path
- add binutils to install - extract libandroid-shmem.a
1 parent f72c911 commit 23c0dcd

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
DIE() { echo -e "${@}"; exit 1 ;:;}
44
GWARN() { echo -e "\e[90m${*}\e[0m";:;}
55

6-
apt install -y jq wget proot pv pulseaudio libandroid-shmem-static
6+
apt install -y jq wget proot pv pulseaudio libandroid-shmem-static binutils
77
[[ ! -d udroid/src ]] && {
88
echo "udroid/src not found"
99
exit 1

udroid/src/proot-utils/proot-fixes.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,8 @@ PROG_PRINT "setting up android shmem"
317317
shmem_lib="${PREFIX}/lib/libandroid-shmem.a"
318318
if [ -f "${shmem_lib}" ]; then
319319
PROG_PRINT "copying android shmem library"
320-
cp "${shmem_lib}" "${root_fs_path}/lib/"
320+
ar x "${shmem_lib}"
321+
mv shmem.o "${root_fs_path}/lib"
321322
# else
322323
# PROG_PRINT "android shmem library not found"
323324

udroid/src/udroid.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ login() {
447447

448448
# set LD_PRELOAD to libandroid-shmem.a
449449
if ! $no_android_shmem; then
450-
shmem_lib_path="${root_fs_path}/lib/libandroid-shmem.a"
450+
shmem_lib_path="${root_fs_path}/lib/shmem.o"
451451
if [ -f "$shmem_lib_path" ]; then
452452
_ld="$shmem_lib_path"
453453
else

0 commit comments

Comments
 (0)