Using llvm-as instead of GAS

scripts/export-build-variables.sh

@@ -55,6 +55,7 @@ export CROSS_PREFIX_WITH_PATH=${TOOLCHAIN_PATH}/bin/llvm-
 # The FAM_ prefix is used to eliminate passing those values implicitly to build systems
 export FAM_ADDR2LINE=${CROSS_PREFIX_WITH_PATH}addr2line
 export        FAM_AR=${CROSS_PREFIX_WITH_PATH}ar
+export        FAM_AS=${CROSS_PREFIX_WITH_PATH}as
 export        FAM_NM=${CROSS_PREFIX_WITH_PATH}nm
 export   FAM_OBJCOPY=${CROSS_PREFIX_WITH_PATH}objcopy
 export   FAM_OBJDUMP=${CROSS_PREFIX_WITH_PATH}objdump
@@ -69,7 +70,6 @@ export TARGET=${TARGET_TRIPLE_MACHINE_CC}-linux-${TARGET_TRIPLE_OS}${ANDROID_PLA
 export FAM_CC=${TOOLCHAIN_PATH}/bin/${TARGET}-clang
 export FAM_CXX=${FAM_CC}++
 export FAM_LD=${FAM_CC}
-export FAM_AS=${FAM_CC}
 
 # TODO consider abondaning this strategy of defining the name of the clang wrapper
 # in favour of just passing -mstackrealign and -fno-addrsig depending on

scripts/libaom/android.cmake

@@ -16,7 +16,7 @@ include("$ENV{ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake")
 if(DEFINED CMAKE_ASM_NASM_COMPILER)
   set(AS_EXECUTABLE ${CMAKE_ASM_NASM_COMPILER})
 else()
-  set(AS_EXECUTABLE ${_CMAKE_TOOLCHAIN_PREFIX}as)
+  set(AS_EXECUTABLE ${ANDROID_ASM_COMPILER})
 endif()
 
 # AV1 Codec Library doesn't recognise 'i686' as CMAKE_SYSTEM_PROCESSOR