Skip to content

Commit

Permalink
support for nmap-7.31
Browse files Browse the repository at this point in the history
  • Loading branch information
kost committed Oct 25, 2016
1 parent 58c1aca commit dba6b3c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions android/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ NDK?=/tmp/android-ndk-r11c
NDKDEST?=/tmp/ndk-$(HOSTARCH)
NDKLEVEL?=9
NDKPLATFORM?=android-$(NDKLEVEL)
ANDROIDDEST?=/sdcard/opt/nmap-7.30
ANDROIDDEST?=/sdcard/opt/nmap-7.31
OPENSSLPLATFORM?=dist
OPENSSLLDFLAGS?="-static"

Expand All @@ -28,12 +28,12 @@ TMPNDK=/tmp/ndk.tar.bz2
TMPDIREXTRACT=/tmp

NDKCP=$(NDK)/build/tools/make_standalone_toolchain.py --arch $(HOSTARCH) --api $(NDKLEVEL) --stl libc++ --force --install-dir=$(NDKDEST)
NDKURL="https://dl.google.com/android/repository/android-ndk-r12b-linux-x86_64.zip"
NDKURL="https://dl.google.com/android/repository/android-ndk-r11c-linux-x86_64.zip"

all:
@echo "Type 'make doit' to automatically download Android NDK and build"
@echo "Type 'make havendk' to build automatically if you have NDK (check Makefile!)"
@echo "For example: make havendk NDK=/data/opt/android-ndk-r12"
@echo "For example: make havendk NDK=/data/opt/android-ndk-r11"

doit: | getndk havendk
@echo "Type 'doit' successfuly built"
Expand Down
2 changes: 1 addition & 1 deletion android/multiarch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -x

ANDROIDDIR=/sdcard/opt
ANDROIDNMAP=nmap-7.30
ANDROIDNMAP=nmap-7.31
NDKARCHPPREFIX=/data/opt/ndk
NDKPATH=/data/opt/android-ndk-r11c
CURDIR=`pwd`
Expand Down

0 comments on commit dba6b3c

Please sign in to comment.