diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 6731d47742..4b7f93f9bc 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -32,8 +32,8 @@ if (BUILD_TOOLS)
     set_target_properties(oven PROPERTIES FOLDER "Tools")
 
     # No need to build on Android or in a Production build
-    if (NOT ANDROID AND NOT RELEASE_TYPE STREQUAL "PRODUCTION")
+    ##if (NOT ANDROID AND NOT RELEASE_TYPE STREQUAL "PRODUCTION")
         add_subdirectory(nitpick)
         set_target_properties(nitpick PROPERTIES FOLDER "Tools")
-    endif()
+    ##endif()
 endif()
diff --git a/tools/nitpick/CMakeLists.txt b/tools/nitpick/CMakeLists.txt
index 35492b4ac3..9d5d38ec1f 100644
--- a/tools/nitpick/CMakeLists.txt
+++ b/tools/nitpick/CMakeLists.txt
@@ -131,7 +131,7 @@ endforeach()
 # include headers for nitpick and NitpickConfig.
 include_directories("${PROJECT_SOURCE_DIR}/src")
 
-if (UNIX)
+if (UNIX AND NOT ANDROID)
     if (CMAKE_SYSTEM_NAME MATCHES "Linux")
         # Linux
         target_link_libraries(${TARGET_NAME} pthread atomic)