[Olympus] Switch back to custom mutex/condition

Author: zbai-sc

libs/utils/CMakeLists.txt

@@ -43,7 +43,7 @@ set(DIST_HDRS
 )
 
 # Use our custom mutex/condition only on ANDROID
-set(DIST_ANDROID_HDRS
+set(DIST_LINUX_HDRS
         ${PUBLIC_HDR_DIR}/${TARGET_LINUX}/Mutex.h
 )
 
@@ -140,8 +140,8 @@ else()
 endif()
 
 install(FILES ${DIST_HDRS} DESTINATION include/${TARGET})
-if (ANDROID)
-    install(FILES ${DIST_ANDROID_HDRS} DESTINATION include/${TARGET_LINUX})
+if (LINUX OR ANDROID)
+    install(FILES ${DIST_LINUX_HDRS} DESTINATION include/${TARGET_LINUX})
 else()
     install(FILES ${DIST_GENERIC_HDRS} DESTINATION include/${TARGET_GENERIC})
 endif()

libs/utils/include/utils/Condition.h

@@ -17,7 +17,7 @@
 #ifndef TNT_UTILS_CONDITION_H
 #define TNT_UTILS_CONDITION_H
 
-#if defined(__ANDROID__)
+#if defined(__linux__)
 #include <utils/linux/Condition.h>
 #else
 #include <utils/generic/Condition.h>

libs/utils/include/utils/Mutex.h

@@ -17,7 +17,7 @@
 #ifndef TNT_UTILS_MUTEX_H
 #define TNT_UTILS_MUTEX_H
 
-#if defined(__ANDROID__)
+#if defined(__linux__)
 #include <utils/linux/Mutex.h>
 #else
 #include <utils/generic/Mutex.h>