diff --git a/script/_common.sh b/script/_common.sh index 87a25bb..c57d1fc 100755 --- a/script/_common.sh +++ b/script/_common.sh @@ -184,6 +184,6 @@ function common_build_make() { shift for make_param in $*; do echo "[info][make_${make_param}_start]" >>"${library_arch_path}/log/output.log" - make $make_param >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make $make_commond error!" + make $make_param >>"${library_arch_path}/log/output.log" 2>&1 || common_die "make $make_param error!" done } diff --git a/script/android-common.sh b/script/android-common.sh index a9f3e8c..6c59c32 100755 --- a/script/android-common.sh +++ b/script/android-common.sh @@ -51,9 +51,9 @@ export ANDROID_TRIPLES=("arm-linux-androideabi" "aarch64-linux-android" "i686-li export ANDROID_API=23 # for test -# ANDROID_ARCHS=("arm64-v8a") -# ANDROID_TRIPLES=("aarch64-linux-android") -# ANDROID_API=23 +ANDROID_ARCHS=("armeabi-v7a") +ANDROID_TRIPLES=("arm-linux-androideabi") +ANDROID_API=23 echo "###############################################################################" >/dev/null echo "#### Function Partition #####" >/dev/null diff --git a/script/android-protobuf.sh b/script/android-protobuf.sh index d85251e..78546df 100755 --- a/script/android-protobuf.sh +++ b/script/android-protobuf.sh @@ -112,7 +112,7 @@ function android_protobuf_build_config_make() { elif [[ "${library_arch}" == "armeabi-v7a" ]]; then - ./configure --host=$(android_get_build_host "${library_arch}") --prefix="${library_arch_path}" --with-protoc=protobuf_command >"${library_arch_path}/log/output.log" 2>&1 || common_die "configure error!" + ./configure --host=$(android_get_build_host "${library_arch}") --prefix="${library_arch_path}" --disable-shared --with-protoc=protobuf_command >"${library_arch_path}/log/output.log" 2>&1 || common_die "configure error!" elif [[ "${library_arch}" == "arm64-v8a" ]]; then