fix bug for dir on android

Author: az

script/android-common.sh

@@ -23,7 +23,7 @@ echo "##########################################################################
 echo "#### Global Variable Partition                                            #####" >/dev/null
 echo "###############################################################################" >/dev/null
 
-export COMMON_PLATFORM_TYPE="Android"
+export COMMON_PLATFORM_TYPE="android"
 export ANDROID_ARCHS=("armeabi-v7a" "arm64-v8a" "x86" "x86-64")
 export ANDROID_TRIPLES=("arm-linux-androideabi" "aarch64-linux-android" "i686-linux-android" "x86_64-linux-android")
 export ANDROID_API=23

script/android-curl.sh

@@ -41,17 +41,17 @@ function android_curl_printf_variable() {
 
 function android_curl_pre_tool_check() {
 
-    openssl_output_dir="${COMMON_OUTPUT_DIR}/$(common_get_library_name_from_id 1)"
+    openssl_output_dir="${COMMON_OUTPUT_DIR}/${COMMON_PLATFORM_TYPE}/$(common_get_library_name_from_id 1)"
     if [ ! -d "${openssl_output_dir}" ]; then
         common_die "Please build the openssl library first!"
     fi
-    nghttp2_output_dir="${COMMON_OUTPUT_DIR}/$(common_get_library_name_from_id 2)"
+    nghttp2_output_dir="${COMMON_OUTPUT_DIR}/${COMMON_PLATFORM_TYPE}/$(common_get_library_name_from_id 2)"
     if [ ! -d "${nghttp2_output_dir}" ]; then
         common_die "Please build the nghttp2 library first!"
     fi
 
     curl_input_dir="${COMMON_INPUT_DIR}/${COMMON_LIBRARY_NAME}"
-    curl_output_dir="${COMMON_OUTPUT_DIR}/${COMMON_LIBRARY_NAME}"
+    curl_output_dir="${COMMON_OUTPUT_DIR}/${COMMON_PLATFORM_TYPE}/${COMMON_LIBRARY_NAME}"
 
     curl_zip_file="${COMMON_DOWNLOAD_ADRESS##*/}"
     curl_zip_file_no_suffix=${curl_zip_file%.tar.gz}

script/android-nghttp2.sh

@@ -38,7 +38,7 @@ function android_nghttp2_printf_variable() {
 function android_nghttp2_pre_tool_check() {
 
   nghttp2_input_dir="${COMMON_INPUT_DIR}/${COMMON_LIBRARY_NAME}"
-  nghttp2_output_dir="${COMMON_OUTPUT_DIR}/${COMMON_LIBRARY_NAME}"
+  nghttp2_output_dir="${COMMON_OUTPUT_DIR}/${COMMON_PLATFORM_TYPE}/${COMMON_LIBRARY_NAME}"
 
   nghttp2_zip_file="${COMMON_DOWNLOAD_ADRESS##*/}"
   nghttp2_zip_file_no_suffix=${nghttp2_zip_file%.tar.gz}

script/android-openssl.sh

@@ -38,7 +38,7 @@ function android_openssl_printf_variable() {
 function android_openssl_pre_tool_check() {
 
     openssl_input_dir="${COMMON_INPUT_DIR}/${COMMON_LIBRARY_NAME}"
-    openssl_output_dir="${COMMON_OUTPUT_DIR}/${COMMON_LIBRARY_NAME}"
+    openssl_output_dir="${COMMON_OUTPUT_DIR}/${COMMON_PLATFORM_TYPE}/${COMMON_LIBRARY_NAME}"
 
     openssl_zip_file="${COMMON_DOWNLOAD_ADRESS##*/}"
     openssl_zip_file_no_suffix=${openssl_zip_file%.tar.gz}