Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-10-08 11:23:27 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix Android build, update Capstone and use Android's Studio NDK if available

Browse Source
This commit is contained in:
pancake 2016-06-22 02:27:32 +02:00
parent 8b957f8512
commit bb00b4e91d
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libr/debug/p/native.mk
View File

@ -11,10 +11,10 @@ endif
ifeq ($(OSTYPE),$(filter $(OSTYPE),gnulinux android))
NATIVE_OBJS=native/linux/linux_debug.o
NATIVE_OBJS+=native/procfs.o
endif
ifeq ($(OSTYPE),$(filter $(OSTYPE),gnulinux))
COREDUMP_OBJS=native/linux/linux_coredump.o
NATIVE_OBJS+=native/procfs.o
endif
${TARGET_PTRACE}: ${OBJ_PTRACE}

4
shlr/Makefile
View File

@ -20,9 +20,9 @@ CS_PATCHES=0
else
CS_TAR=
CS_URL=$(GIT_PREFIX)github.com/aquynh/capstone.git
CS_UPD=20160618
CS_UPD=20160622
CS_BRA=next
CS_TIP=d7c3a980c9c6ea5f6b925f9ec5bba53675a3698a
CS_TIP=30a70487e8b8527b87e71cb9ca990ab43e415969
# REVERT THIS COMMIT BECAUSE ITS WRONG
CS_REV=
CS_PATCHES=1

7
sys/android-shell.sh
View File

@ -51,6 +51,13 @@ if [ -f ~/.r2androidrc ]; then
echo "Using data from ${HOME}/.r2androidrc.."
else
#[ -z "${SDK}" ] && SDK=${HOME}/Downloads/android-sdk-${OS}
if [ -z "${NDK}" ]; then
if [ "`uname`" = "Darwin" ]; then
NDK=${HOME}/Library/Android/sdk/ndk-bundle/
else
NDK=${HOME}/Downloads/android-ndk-r7b
fi
fi
[ -z "${NDK}" ] && NDK=${HOME}/Downloads/android-ndk-r7b
fi