Skip to content

Commit bc0050f

Browse files
!: close shmem for now
1 parent 23c0dcd commit bc0050f

File tree

3 files changed

+20
-20
lines changed

3 files changed

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

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -313,16 +313,16 @@ while read -r group_name group_id; do
313313
fi
314314
done < <(paste <(id -Gn | tr ' ' '\n') <(id -G | tr ' ' '\n'))
315315

316-
PROG_PRINT "setting up android shmem"
317-
shmem_lib="${PREFIX}/lib/libandroid-shmem.a"
318-
if [ -f "${shmem_lib}" ]; then
319-
PROG_PRINT "copying android shmem library"
320-
ar x "${shmem_lib}"
321-
mv shmem.o "${root_fs_path}/lib"
322-
# else
323-
# PROG_PRINT "android shmem library not found"
316+
# PROG_PRINT "setting up android shmem"
317+
# shmem_lib="${PREFIX}/lib/libandroid-shmem.a"
318+
# if [ -f "${shmem_lib}" ]; then
319+
# PROG_PRINT "copying android shmem library"
320+
# ar x "${shmem_lib}"
321+
# mv shmem.o "${root_fs_path}/lib"
322+
# # else
323+
# # PROG_PRINT "android shmem library not found"
324324

325-
fi
325+
# fi
326326

327327
# ## android GID
328328
# # a list of all android groups

udroid/src/udroid.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -445,22 +445,22 @@ login() {
445445
fi
446446
fi
447447

448-
# set LD_PRELOAD to libandroid-shmem.a
449-
if ! $no_android_shmem; then
450-
shmem_lib_path="${root_fs_path}/lib/shmem.o"
451-
if [ -f "$shmem_lib_path" ]; then
452-
_ld="$shmem_lib_path"
453-
else
454-
_ld=""
455-
fi
456-
fi
448+
# # set LD_PRELOAD to libandroid-shmem.a
449+
# if ! $no_android_shmem; then
450+
# shmem_lib_path="${root_fs_path}/lib/shmem.o"
451+
# if [ -f "$shmem_lib_path" ]; then
452+
# _ld="$shmem_lib_path"
453+
# else
454+
# _ld=""
455+
# fi
456+
# fi
457457
# set basic environment variables
458458
set -- "/usr/bin/env" "-i" \
459459
"HOME=/root" \
460460
"LANG=C.UTF-8" \
461461
"TERM=${TERM-xterm-256color}" \
462-
"LD_PRELOAD=$_ld" \
463462
"$@"
463+
# "LD_PRELOAD=$_ld" \
464464

465465
# set --rootfs
466466
set -- "--rootfs=${root_fs_path}" "$@"

0 commit comments

Comments
 (0)