diff --git a/app/jni/Android.mk b/app/jni/Android.mk index 46135bf..0bf9fd5 100644 --- a/app/jni/Android.mk +++ b/app/jni/Android.mk @@ -4,7 +4,6 @@ LOCAL_MODULE := i2pd LOCAL_CPP_FEATURES := rtti exceptions LOCAL_C_INCLUDES += $(IFADDRS_PATH) $(LIB_SRC_PATH) $(LIB_CLIENT_SRC_PATH) $(LANG_SRC_PATH) $(DAEMON_SRC_PATH) LOCAL_STATIC_LIBRARIES := \ - boost_system \ boost_program_options \ crypto \ ssl \ @@ -27,13 +26,6 @@ LOCAL_SRC_FILES := \ include $(BUILD_SHARED_LIBRARY) -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) -LOCAL_MODULE := boost_system -LOCAL_SRC_FILES := $(BOOST_PATH)/build/out/$(TARGET_ARCH_ABI)/lib/libboost_system.a -LOCAL_EXPORT_C_INCLUDES := $(BOOST_PATH)/build/out/$(TARGET_ARCH_ABI)/include -include $(PREBUILT_STATIC_LIBRARY) - LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := boost_program_options diff --git a/binary/jni/boost b/binary/jni/boost index 2335700..51924ec 160000 --- a/binary/jni/boost +++ b/binary/jni/boost @@ -1 +1 @@ -Subproject commit 2335700042dc9882c5d03e210f9f58ab3ac83b58 +Subproject commit 51924ec5533a4fefb5edf99feaeded794c06a4fb diff --git a/binary/jni/build_boost.sh b/binary/jni/build_boost.sh index 1bb1052..2578967 100755 --- a/binary/jni/build_boost.sh +++ b/binary/jni/build_boost.sh @@ -71,7 +71,6 @@ cd boost # disable verbose output sed -i -E -e 's/d\+2/d\+0/' build-android.sh -sed -i -E -e 's/\"23\.1\"\|\"25\.0\"/\"23\.1\"\|\"23\.2\"\|\"25\.0\"/' build-android.sh if (( $# == 0 )); then build all