Fixes for the android compilations ##build

libr/main/deps.mk

@@ -4,6 +4,7 @@ ifeq ($(MAIN_LINK_ALL),1)
 DEPS=r_config r_cons r_io r_util r_flag r_asm r_core
 DEPS+=r_debug r_hash r_bin r_lang r_io r_anal r_parse r_bp r_egg
 DEPS+=r_reg r_search r_syscall r_socket r_fs r_magic r_crypto
+
 else
 # only works
 WITH_LIBS=0

mk/android.mk

@@ -41,13 +41,14 @@ endif
 
 RANLIB=${CROSS}ranlib
 AR=${CROSS}ar
-CC_AR=${AR} -r ${LIBAR}
-PARTIALLD=${CROSS}ld -r --whole-archive
+CC_AR=${CROSS}ar -r ${LIBAR}
+PARTIALLD=${CROSS}ld -r -all_load
 ONELIB=0
 OSTYPE=android
 LINK=
 #CC_AR=ndk-ar -r ${LIBAR}
 PICFLAGS=-fPIC -fpic
+LDFLAGS_LIB=-shared
 CFLAGS+=${PICFLAGS}
 CC_LIB=${CC} -shared -o
 CFLAGS_INCLUDE=-I

plugins.android.cfg

@@ -0,0 +1,91 @@
+STATIC="
+asm.bf
+asm.avr
+asm.java
+asm.arm_cs
+asm.dalvik
+asm.wasm
+asm.mips_cs
+asm.x86_nz
+asm.x86_cs
+asm.gb
+anal.bf
+anal.avr
+anal.null
+anal.x86_cs
+anal.arm_cs
+anal.mips_cs
+anal.java
+anal.wasm
+anal.dalvik
+anal.gb
+bin.any
+bin.bios
+bin.elf
+bin.elf64
+bin.java
+bin.dex
+bin.pe
+bin.ne
+bin.pebble
+bin.mz
+bin.pe64
+bin.te
+bin.coff
+bin.mach0
+bin.mach064
+bin.ningb
+bin.ningba
+bin.ninds
+bin.dyldcache
+bin.xnu_kernelcache
+bin.nin3ds
+bin.xbe
+bin_xtr.xtr_fatmach0
+bin_xtr.xtr_dyldcache
+bp.arm
+bp.bf
+bp.x86
+bp.mips
+core.a2f
+core.java
+crypto.aes
+debug.native
+debug.esil
+debug.rap
+debug.bf
+debug.io
+egg.exec
+egg.xor
+fs.io
+fs.fat
+fs.ntfs
+fs.ext2
+fs.hfs
+fs.hfsplus
+fs.reiserfs
+fs.posix
+io.debug
+io.rap
+io.gzip
+io.http
+io.bfdbg
+io.mmap
+io.default
+io.self
+io.mach
+io.malloc
+io.sparse
+io.ihex
+io.ptrace
+io.procpid
+io.r2k
+io.r2web
+io.r2pipe
+io.zip
+lang.vala
+parse.att2intel
+parse.mips_pseudo
+parse.dalvik_pseudo
+parse.x86_pseudo"
+SHARED=""

sys/android-build.sh

@@ -128,7 +128,7 @@ if [ "${BUILD}" = 1 ]; then
 			--with-ostype=android \
 			--without-libuv \
 			--prefix=${PREFIX} ${CFGFLAGS}
-
+		cp -f plugins.android.cfg plugins.cfg
 		./configure --with-compiler=android --without-libuv \
 			--with-ostype=android \
 			--prefix=${PREFIX} ${CFGFLAGS} || exit 1