temp

AsteriskZuo · Jun 3, 2020 · ed7e0da · ed7e0da
1 parent 6927ea6
commit ed7e0da
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git 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=("armeabi-v7a")
-ANDROID_TRIPLES=("arm-linux-androideabi")
-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
@@ -102,16 +102,20 @@ function android_protobuf_build_config_make() {
     pushd .
     cd "$protobuf_zip_file_no_suffix_path"
 
+    # git submodule update --init --recursive
     if [[ "${library_arch}" == "x86-64" ]]; 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!"
+        # scc_info_FileDescriptorProto_google_2fprotobuf_2fdescriptor_2eproto , so use --disable-shared
+        ./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}" == "x86" ]]; 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!"
+        # scc_info_FileDescriptorProto_google_2fprotobuf_2fdescriptor_2eproto , so use --disable-shared
+        ./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}" == "armeabi-v7a" ]]; then
 
+        # scc_info_FileDescriptorProto_google_2fprotobuf_2fdescriptor_2eproto , so use --disable-shared
         ./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