From f0529fd1dae30f6fab24f1d0d4ca0a9eb0d70c26 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Sun, 13 Mar 2016 13:00:37 -0700
Subject: [PATCH] Fix android build

---
 qgroundcontrol.pro                 | 2 +-
 src/MobileScreenMgr.cc             | 2 ++
 src/Vehicle/MultiVehicleManager.cc | 4 ----
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index a25ad3bd7..e7c50a83b 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -369,7 +369,7 @@ iOSBuild {
         src/audio/QGCAudioWorker_iOS.mm \
         src/MobileScreenMgr.mm \
 }
-androidBuild {
+AndroidBuild {
     SOURCES += src/MobileScreenMgr.cc \
 }
 
diff --git a/src/MobileScreenMgr.cc b/src/MobileScreenMgr.cc
index 7f469e66e..1945ab3d9 100644
--- a/src/MobileScreenMgr.cc
+++ b/src/MobileScreenMgr.cc
@@ -26,6 +26,8 @@
 #include <QtAndroidExtras/QtAndroidExtras>
 #include <QtAndroidExtras/QAndroidJniObject>
 
+static const char* kJniClassName = "org/qgroundcontrol/qgchelper/UsbDeviceJNI";
+
 void MobileScreenMgr::setKeepScreenOn(bool keepScreenOn)
 {
     if (keepScreenOn) {
diff --git a/src/Vehicle/MultiVehicleManager.cc b/src/Vehicle/MultiVehicleManager.cc
index ffff63370..9f7a9a9db 100644
--- a/src/Vehicle/MultiVehicleManager.cc
+++ b/src/Vehicle/MultiVehicleManager.cc
@@ -40,10 +40,6 @@ QGC_LOGGING_CATEGORY(MultiVehicleManagerLog, "MultiVehicleManagerLog")
 
 const char* MultiVehicleManager::_gcsHeartbeatEnabledKey = "gcsHeartbeatEnabled";
 
-#if defined __android__
-static const char* kJniClassName = "org/qgroundcontrol/qgchelper/UsbDeviceJNI";
-#endif
-
 MultiVehicleManager::MultiVehicleManager(QGCApplication* app)
     : QGCTool(app)
     , _activeVehicleAvailable(false)
-- 
2.22.0