diff options
| author | Alexander Blair <snipa@jagtech.io> | 2020-10-28 00:42:35 -0700 |
|---|---|---|
| committer | Alexander Blair <snipa@jagtech.io> | 2020-10-28 00:42:36 -0700 |
| commit | c9fd9634ee7b2fec90778a21e93935c62cd90788 (patch) | |
| tree | 641a369d49ac338007e2415a8ee9372e6d5abb7f /android/docker/android.mk.patch | |
| parent | ddcee95b88c5628c88b90f7fc2317981f4e72652 (diff) | |
| parent | cd054f6c26c27964425ec7d93de99821e6309fc2 (diff) | |
| download | monzero-gui-c9fd9634ee7b2fec90778a21e93935c62cd90788.tar.gz monzero-gui-c9fd9634ee7b2fec90778a21e93935c62cd90788.tar.xz monzero-gui-c9fd9634ee7b2fec90778a21e93935c62cd90788.zip | |
Merge pull request #3187
cd054f6c docker: fix Android build, update to Qt 5.15, README.md build steps (xiphon)
d6cb9b6c docker: move Android Dockerfile to root (xiphon)
Diffstat (limited to 'android/docker/android.mk.patch')
| -rw-r--r-- | android/docker/android.mk.patch | 61 |
1 files changed, 0 insertions, 61 deletions
diff --git a/android/docker/android.mk.patch b/android/docker/android.mk.patch deleted file mode 100644 index 9fd7f172..00000000 --- a/android/docker/android.mk.patch +++ /dev/null @@ -1,61 +0,0 @@ -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) |