From 2b23d05c84b284db9c07e1adbe2155da15677285 Mon Sep 17 00:00:00 2001
From: dogmaphobic <mavlink@grubba.com>
Date: Fri, 19 Feb 2016 23:48:51 -0500
Subject: [PATCH] Merge conflict fix missed the Android only variable.

---
 src/Vehicle/MultiVehicleManager.cc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Vehicle/MultiVehicleManager.cc b/src/Vehicle/MultiVehicleManager.cc
index d148cd225..7646e92e8 100644
--- a/src/Vehicle/MultiVehicleManager.cc
+++ b/src/Vehicle/MultiVehicleManager.cc
@@ -40,7 +40,10 @@
 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)
-- 
2.22.0