diff options
| author | Keksoj <herrbosquet@gmail.com> | 2017-09-15 23:01:11 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-15 23:01:11 +0200 |
| commit | c712444e174e57aa083973ac91f458ce499787cf (patch) | |
| tree | 70df5c9c70773f7f9721c2270bf34e83c04a5e1c /android/docker/android.mk.patch | |
| parent | 3e90c3d8251a418387307f24fa039c739124ff05 (diff) | |
| parent | 4066cb22ea9e17c831f0f751911814d6fabefcdb (diff) | |
| download | monzero-gui-c712444e174e57aa083973ac91f458ce499787cf.tar.gz monzero-gui-c712444e174e57aa083973ac91f458ce499787cf.tar.xz monzero-gui-c712444e174e57aa083973ac91f458ce499787cf.zip | |
Merge pull request #1 from erciccione/fix
Fix conflicts and rebase.
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) |