diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-08-23 21:19:23 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-08-23 21:19:24 +0200 |
| commit | 1ce573afe230ff166e31564f642455b7042c660f (patch) | |
| tree | 93731da5e48c2de4d8cbb8056b4b463757377e77 /android/docker/android.mk.patch | |
| parent | c68c31777693ae75b59c0d24c44195a97bbf0c1c (diff) | |
| parent | 6730b63018b6486a082afb9e3761b19665f50e86 (diff) | |
| download | monzero-gui-1ce573afe230ff166e31564f642455b7042c660f.tar.gz monzero-gui-1ce573afe230ff166e31564f642455b7042c660f.tar.xz monzero-gui-1ce573afe230ff166e31564f642455b7042c660f.zip | |
Merge pull request #786
6730b63 Add dockerfile for android NDK build (MoroccanMalinois)
Diffstat (limited to 'android/docker/android.mk.patch')
| -rw-r--r-- | android/docker/android.mk.patch | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/android/docker/android.mk.patch b/android/docker/android.mk.patch new file mode 100644 index 00000000..9fd7f172 --- /dev/null +++ b/android/docker/android.mk.patch @@ -0,0 +1,61 @@ +diff --git a/android/jni/Android.mk b/android/jni/Android.mk +index e442b07..158afd5 100644 +--- a/android/jni/Android.mk ++++ b/android/jni/Android.mk +@@ -12,14 +12,18 @@ LOCAL_PATH := $(ICONV_SRC) + + LOCAL_MODULE := libiconv + ++LOCAL_ARM_MODE := arm ++LOCAL_CPP_FEATURES := exceptions rtti features + LOCAL_CFLAGS := \ + -Wno-multichar \ + -D_ANDROID \ +- -DLIBDIR="c" \ ++ -DLIBDIR="\".\"" \ + -DBUILDING_LIBICONV \ + -DBUILDING_LIBCHARSET \ + -DIN_LIBRARY + ++LOCAL_CFLAGS += -fno-stack-protector ++ + LOCAL_SRC_FILES := \ + lib/iconv.c \ + libcharset/lib/localcharset.c \ +@@ -30,13 +34,14 @@ LOCAL_C_INCLUDES := \ + $(ICONV_SRC)/libcharset \ + $(ICONV_SRC)/libcharset/include + +-include $(BUILD_SHARED_LIBRARY) ++include $(BUILD_STATIC_LIBRARY) + + LOCAL_LDLIBS := -llog -lcharset + + # libzbarjni + include $(CLEAR_VARS) + ++ + LOCAL_PATH := $(MY_LOCAL_PATH) + LOCAL_MODULE := zbarjni + LOCAL_SRC_FILES := ../../java/zbarjni.c \ +@@ -71,6 +76,17 @@ LOCAL_C_INCLUDES := ../include \ + ../zbar \ + $(ICONV_SRC)/include + +-LOCAL_SHARED_LIBRARIES := libiconv ++LOCAL_STATIC_LIBRARIES := libiconv ++LOCAL_ARM_MODE := arm ++LOCAL_CPP_FEATURES := exceptions rtti features ++ ++LOCAL_CFLAGS := \ ++ -Wno-multichar \ ++ -D_ANDROID \ ++ -DLIBDIR="\".\"" \ ++ -DBUILDING_LIBICONV \ ++ -DBUILDING_LIBCHARSET \ ++ -DIN_LIBRARY ++ + +-include $(BUILD_SHARED_LIBRARY) +\ No newline at end of file ++include $(BUILD_STATIC_LIBRARY) |