diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt
index a0932c85e..e7de133a3 100644
--- a/coreapi/CMakeLists.txt
+++ b/coreapi/CMakeLists.txt
@@ -241,7 +241,11 @@ if(ENABLE_SHARED)
 		set_target_properties(linphone PROPERTIES PREFIX "lib")
 	elseif(ANDROID)
 		target_link_libraries(linphone PUBLIC "log" ${SUPPORT_LIBRARIES} ${CPUFEATURES_LIBRARIES})
-		set_target_properties(linphone PROPERTIES OUTPUT_NAME "linphone-${CMAKE_ANDROID_ARCH_ABI}")
+		if(ENABLE_ARCH_SUFFIX)
+			set_target_properties(linphone PROPERTIES OUTPUT_NAME "linphone-${CMAKE_ANDROID_ARCH_ABI}")
+		else()
+			set_target_properties(linphone PROPERTIES OUTPUT_NAME "linphone")
+		endif()
 		add_dependencies(linphone linphonecore-jni-header)
 	endif()
 	if(MSVC)