File tree Expand file tree Collapse file tree 2 files changed +9
-5
lines changed Expand file tree Collapse file tree 2 files changed +9
-5
lines changed Original file line number Diff line number Diff line change @@ -51,9 +51,9 @@ export ANDROID_TRIPLES=("arm-linux-androideabi" "aarch64-linux-android" "i686-li
5151export ANDROID_API=23
5252
5353# for test
54- ANDROID_ARCHS=(" armeabi-v7a" )
55- ANDROID_TRIPLES=(" arm-linux-androideabi" )
56- ANDROID_API=23
54+ # ANDROID_ARCHS=("armeabi-v7a")
55+ # ANDROID_TRIPLES=("arm-linux-androideabi")
56+ # ANDROID_API=23
5757
5858echo " ###############################################################################" > /dev/null
5959echo " #### Function Partition #####" > /dev/null
Original file line number Diff line number Diff line change @@ -102,16 +102,20 @@ function android_protobuf_build_config_make() {
102102 pushd .
103103 cd " $protobuf_zip_file_no_suffix_path "
104104
105+ # git submodule update --init --recursive
105106 if [[ " ${library_arch} " == " x86-64" ]]; then
106107
107- ./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!"
108+ # scc_info_FileDescriptorProto_google_2fprotobuf_2fdescriptor_2eproto , so use --disable-shared
109+ ./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!"
108110
109111 elif [[ " ${library_arch} " == " x86" ]]; then
110112
111- ./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!"
113+ # scc_info_FileDescriptorProto_google_2fprotobuf_2fdescriptor_2eproto , so use --disable-shared
114+ ./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!"
112115
113116 elif [[ " ${library_arch} " == " armeabi-v7a" ]]; then
114117
118+ # scc_info_FileDescriptorProto_google_2fprotobuf_2fdescriptor_2eproto , so use --disable-shared
115119 ./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!"
116120
117121 elif [[ " ${library_arch} " == " arm64-v8a" ]]; then
You can’t perform that action at this time.
0 commit comments