| 1 | diff -u -r orig/makefile.android_arm p7zip_15.09/makefile.android_arm |
| 2 | --- orig/makefile.android_arm 2015-09-13 15:15:17.000000000 -0300 |
| 3 | +++ p7zip_15.09/makefile.android_arm 2015-12-21 13:50:55.895794056 -0300 |
| 4 | @@ -1,12 +1,7 @@ |
| 5 | # |
| 6 | -# makefile for ANDROID (generic ARM) |
| 7 | +# makefile for Android with Termux |
| 8 | # |
| 9 | |
| 10 | -ANDROID_NDK_HOME=$(HOME)/ANDROID/android-ndk-r5c |
| 11 | -ANDROID_NDK_BIN=$(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/bin |
| 12 | - |
| 13 | -# -fpic -Os |
| 14 | -# -fstack-protector |
| 15 | ANDROID_FLAGS=\ |
| 16 | -ffunction-sections \ |
| 17 | -funwind-tables \ |
| 18 | @@ -16,27 +11,18 @@ |
| 19 | -D__ARM_ARCH_5TE__ \ |
| 20 | -DANDROID \ |
| 21 | -DANDROID_NDK \ |
| 22 | + -D_UNICODE \ |
| 23 | + -DUNICODE \ |
| 24 | -Wno-psabi \ |
| 25 | - -march=armv5te \ |
| 26 | - -mtune=xscale \ |
| 27 | - -msoft-float \ |
| 28 | -mthumb \ |
| 29 | -fomit-frame-pointer \ |
| 30 | -fno-strict-aliasing -finline-limit=64 \ |
| 31 | - -I$(ANDROID_NDK_HOME)/sources/cxx-stl/system/include \ |
| 32 | - -I$(ANDROID_NDK_HOME)/platforms/android-3/arch-arm/usr/include \ |
| 33 | - -Wa,--noexecstack |
| 34 | + -Wa,--noexecstack |
| 35 | |
| 36 | ANDROID_LINK=-v \ |
| 37 | -Wl,--gc-sections -Wl,-z,nocopyreloc \ |
| 38 | - --sysroot=$(ANDROID_NDK_HOME)/platforms/android-3/arch-arm \ |
| 39 | - $(ANDROID_NDK_HOME)/platforms/android-3/arch-arm/usr/lib/libc.so \ |
| 40 | - $(ANDROID_NDK_HOME)/platforms/android-3/arch-arm/usr/lib/libstdc++.so \ |
| 41 | - $(ANDROID_NDK_HOME)/platforms/android-3/arch-arm/usr/lib/libm.so \ |
| 42 | -Wl,--no-undefined -Wl,-z,noexecstack \ |
| 43 | - -L$(ANDROID_NDK_HOME)/platforms/android-3/arch-arm/usr/lib \ |
| 44 | - -lstdc++ -Wl,-rpath-link=$(ANDROID_NDK_HOME)/platforms/android-3/arch-arm/usr/lib \ |
| 45 | - -lsupc++ |
| 46 | + -lstdc++ -lsupc++ |
| 47 | |
| 48 | OPTFLAGS=-O3 -s |
| 49 | |
| 50 | @@ -45,14 +31,14 @@ |
| 51 | $(ANDROID_FLAGS) \ |
| 52 | $(LOCAL_FLAGS) |
| 53 | |
| 54 | -CXX=$(ANDROID_NDK_BIN)/arm-linux-androideabi-g++ -fexceptions -frtti |
| 55 | -CC=$(ANDROID_NDK_BIN)/arm-linux-androideabi-gcc |
| 56 | -CC_SHARED= -fpic |
| 57 | -LINK_SHARED=-fpic -shared |
| 58 | +CXX=arm-linux-androideabi-g++ -fexceptions -frtti |
| 59 | +CC=arm-linux-androideabi-gcc |
| 60 | + |
| 61 | +CC_SHARED=-fPIC |
| 62 | +LINK_SHARED=-fPIC -shared |
| 63 | |
| 64 | LOCAL_LIBS=$(ANDROID_LINK) |
| 65 | -LOCAL_LIBS_DLL=$(LOCAL_LIBS) # -ldl |
| 66 | +LOCAL_LIBS_DLL=$(LOCAL_LIBS) |
| 67 | |
| 68 | OBJ_CRC32=$(OBJ_CRC32_C) |
| 69 | OBJ_AES= |
| 70 | - |