[BUG]wrap.sh LD_PRELOAD and java debug support conflict

[xiaoyur347]

Description

Background:
Android ndk r25 fixes Issue 933: Updated reference ASan wrap.sh to support attaching the Java debugger.

Current wrap.sh:

#!/system/bin/sh
HERE=$(cd "$(dirname "$0")" && pwd)

cmd=$1
shift

export ASAN_OPTIONS=log_to_syslog=false,allow_user_segv_handler=1
ASAN_LIB=$(ls "$HERE"/libclang_rt.asan-*-android.so)
if [ -f "$HERE/libc++_shared.so" ]; then
    # Workaround for https://github.com/android-ndk/ndk/issues/988.
    export LD_PRELOAD="$ASAN_LIB $HERE/libc++_shared.so"
else
    export LD_PRELOAD="$ASAN_LIB"
fi

os_version=$(getprop ro.build.version.sdk)

if [ "$os_version" -eq "27" ]; then
  cmd="$cmd -Xrunjdwp:transport=dt_android_adb,suspend=n,server=y -Xcompiler-option --debuggable $@"
elif [ "$os_version" -eq "28" ]; then
  cmd="$cmd -XjdwpProvider:adbconnection -XjdwpOptions:suspend=n,server=y -Xcompiler-option --debuggable $@"
else
  cmd="$cmd -XjdwpProvider:adbconnection -XjdwpOptions:suspend=n,server=y $@"
fi

exec $cmd

Problem:
LD_PRELOAD should be put just before 'exec' command to make sure only the app has the LD_PRELOAD env.
But now, getprop is also putted with LD_PRELOAD env.
Error message:
F libc : CANNOT LINK EXECUTABLE "getprop": "/data/app/xxx/lib/arm/libclang_rt.asan-arm-android.so" is 32-bit instead of 64-bit

Suggestion:

#!/system/bin/sh
HERE=$(cd "$(dirname "$0")" && pwd)

cmd=$1
shift

os_version=$(getprop ro.build.version.sdk)

if [ "$os_version" -eq "27" ]; then
  cmd="$cmd -Xrunjdwp:transport=dt_android_adb,suspend=n,server=y -Xcompiler-option --debuggable $@"
elif [ "$os_version" -eq "28" ]; then
  cmd="$cmd -XjdwpProvider:adbconnection -XjdwpOptions:suspend=n,server=y -Xcompiler-option --debuggable $@"
else
  cmd="$cmd -XjdwpProvider:adbconnection -XjdwpOptions:suspend=n,server=y $@"
fi

export ASAN_OPTIONS=log_to_syslog=false,allow_user_segv_handler=1
ASAN_LIB=$(ls "$HERE"/libclang_rt.asan-*-android.so)
if [ -f "$HERE/libc++_shared.so" ]; then
    # Workaround for https://github.com/android-ndk/ndk/issues/988.
    export LD_PRELOAD="$ASAN_LIB $HERE/libc++_shared.so"
else
    export LD_PRELOAD="$ASAN_LIB"
fi

exec $cmd

Affected versions

r25

Canary version

No response

Host OS

Linux

Host OS version

android

Affected ABIs

armeabi-v7a

Build system

CMake

Other build system

No response

minSdkVersion

14

Device API level

No response

[DanAlbert]

Thanks, applied your patch: https://android-review.googlesource.com/c/platform/ndk/+/2175186. Will cherry-pick to r25b.