diff options
Diffstat (limited to 'platform/android/scripts/debug.sh')
| -rwxr-xr-x | platform/android/scripts/debug.sh | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/platform/android/scripts/debug.sh b/platform/android/scripts/debug.sh index efed96969a..c3390b4ce1 100755 --- a/platform/android/scripts/debug.sh +++ b/platform/android/scripts/debug.sh @@ -5,13 +5,12 @@ set -o pipefail # Automation of https://github.com/mapbox/mapbox-gl-native/wiki/Android-debugging-with-remote-GDB -export MASON_DIR="`pwd`/.mason" -export PATH="${MASON_DIR}:${PATH}" - -export MASON_ANDROID_ABI=x86 export MASON_ANDROID_ARCH=x86 export MASON_ANDROID_PLATFORM=9 -export MASON_NDK_PACKAGE_VERSION=${MASON_ANDROID_ARCH}-${MASON_ANDROID_PLATFORM}-r12b +export MASON_ANDROID_NDK_VERSION=r13b + +export MASON_XC_ROOT=`scripts/mason.sh PREFIX android-ndk VERSION ${MASON_ANDROID_ARCH}-${MASON_ANDROID_PLATFORM}-${MASON_ANDROID_NDK_VERSION}` +source ${MASON_XC_ROOT}/toolchain.sh if [[ $1 == '--prepare' ]]; then mkdir -p ~/.android/debugging/{vendor,system}_lib @@ -21,16 +20,16 @@ if [[ $1 == '--prepare' ]]; then adb pull /system/bin/app_process32 ~/.android/debugging adb pull /system/bin/linker ~/.android/debugging - if [[ ${MASON_ANDROID_ABI} == 'x86_64' || ${MASON_ANDROID_ABI} == 'mips64' ]]; then + if [[ ${MASON_ANDROID_ARCH} == 'arm-v8' || ${MASON_ANDROID_ARCH} == 'x86-64' || ${MASON_ANDROID_ARCH} == 'mips-64' ]]; then adb pull /system/bin/app_process64 ~/.android/debugging adb pull /system/bin/linker64 ~/.android/debugging fi - cp `mason prefix android-ndk ${MASON_NDK_PACKAGE_VERSION}`/prebuilt/android-${MASON_ANDROID_ABI}/gdbserver/gdbserver \ - platform/android/MapboxGLAndroidSDK/src/main/jniLibs/${MASON_ANDROID_ABI}/gdbserver.so + cp ${MASON_XC_ROOT}/prebuilt/gdbserver/gdbserver \ + platform/android/MapboxGLAndroidSDK/src/main/jniLibs/${ANDROID_ABI}/gdbserver.so fi -adb install -rtdg platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/MapboxGLAndroidSDKTestApp-debug.apk +adb install -r -t -d -g platform/android/MapboxGLAndroidSDKTestApp/build/outputs/apk/MapboxGLAndroidSDKTestApp-debug.apk adb shell am start -n "com.mapbox.mapboxsdk.testapp/com.mapbox.mapboxsdk.testapp.activity.FeatureOverviewActivity" \ -a android.intent.action.MAIN -c android.intent.category.LAUNCHER @@ -38,9 +37,6 @@ adb forward tcp:5039 tcp:5039 adb shell run-as com.mapbox.mapboxsdk.testapp '/data/data/com.mapbox.mapboxsdk.testapp/lib/gdbserver.so \ --attach :5039 `pgrep com.mapbox.mapboxsdk.testapp`' & -export MASON_PLATFORM=android -export PATH=`mason env PATH` -`mason env MASON_ANDROID_TOOLCHAIN`-gdb \ +${MASON_XC_ROOT}/bin/gdb \ -ex "target remote :5039" \ - -ex "set solib-search-path ~/.android/debugging:~/.android/debugging/system_lib:~/.android/debugging/vendor_lib:~/.android/debugging/vendor_lib/egl:./build/android-${MASON_ANDROID_ABI}/Debug/lib.target/" - + -ex "set solib-search-path ~/.android/debugging:~/.android/debugging/system_lib:~/.android/debugging/vendor_lib:~/.android/debugging/vendor_lib/egl:./build/android-${MASON_ANDROID_ARCH}-${MASON_ANDROID_PLATFORM}/Debug/lib.target/" |