From 56fa467b637aa69a580fb004c57f54b0adc39576 Mon Sep 17 00:00:00 2001
From: NissimHadar <nissim.hadar@gmail.com>
Date: Mon, 21 Jan 2019 10:26:19 -0800
Subject: [PATCH] Testing.

---
 android/docker/Dockerfile    | 3 ++-
 tools/CMakeLists.txt         | 4 ++--
 tools/nitpick/CMakeLists.txt | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile
index 15b35ae6a4..2a6943cbc2 100644
--- a/android/docker/Dockerfile
+++ b/android/docker/Dockerfile
@@ -27,7 +27,8 @@ RUN mkdir -p "$ANDROID_HOME" "$ANDROID_SDK_HOME" && \
     unzip sdk.zip && \
     rm sdk.zip && \
     yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses
-RUN yes | $ANDROID_HOME/tools/bin/sdkmanager --licenses && $ANDROID_HOME/tools/bin/sdkmanager --update # Install Android Build Tool and Libraries
+
+# Install Android Build Tool and Libraries
 RUN $ANDROID_HOME/tools/bin/sdkmanager --update
 RUN $ANDROID_HOME/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" \
     "platforms;android-${ANDROID_VERSION}" \
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 6731d47742..64a374bbcf 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 9d5d38ec1f..f019a5410f 100644
--- a/tools/nitpick/CMakeLists.txt
+++ b/tools/nitpick/CMakeLists.txt
@@ -76,6 +76,9 @@ elseif (WIN32)
 
     # add an executable that also has the icon itself and the configured rc file as resources
     add_executable(${TARGET_NAME} WIN32 ${NITPICK_SRCS} ${QM} ${CONFIGURE_ICON_RC_OUTPUT} ${CONFIGURE_VERSION_INFO_RC_OUTPUT})
+elseif (ANDROID)
+  # on android the target is a library that gets linked/used by the APK shell that qtcreateapk produces
+  add_library(${TARGET_NAME} ${INTERFACE_SRCS} ${QM})
 else ()
     add_executable(${TARGET_NAME} ${NITPICK_SRCS} ${QM})
 endif ()