Merge branch 'research/Test-on-Android-5-#6543' into develop

1 files changed, 5 insertions, 1 deletions

diff --git a/app/openssl/import_openssl.sh b/app/openssl/import_openssl.sh
index f16596bc..dc4049ca 100755
--- a/app/openssl/import_openssl.sh
+++ b/app/openssl/import_openssl.sh
@@ -439,6 +439,9 @@ LOCAL_ADDITIONAL_DEPENDENCIES += \$(LOCAL_PATH)/$(basename $output)
     print_vardef_with_prefix_in_mk common_c_includes external/openssl/ $common_includes
 
     for arch in $all_archs; do
+      arch_clang_asflags=$(var_sorted_value OPENSSL_${prefix}_CLANG_ASFLAGS_${arch})
+      print_vardef_in_mk ${arch}_clang_asflags $arch_clang_asflags
+
       arch_defines=$(var_sorted_value OPENSSL_${prefix}_DEFINES_${arch})
       print_defines_in_mk ${arch}_cflags $arch_defines
 
@@ -457,7 +460,8 @@ LOCAL_C_INCLUDES += \$(common_c_includes)"
       for arch in $all_archs; do
         echo "
 LOCAL_SRC_FILES_${arch} += \$(filter-out \$(${arch}_exclude_files),\$(common_src_files) \$(${arch}_src_files))
-LOCAL_CFLAGS_${arch} += \$(${arch}_cflags)"
+LOCAL_CFLAGS_${arch} += \$(${arch}_cflags)
+LOCAL_CLANG_ASFLAGS_${arch} += \$(${arch}_clang_asflags)"
       done
     else
       echo "