Merge conflict fix missed the Android only variable.

9 years ago · 2b23d05c84
1 changed files with 3 additions and 0 deletions
--- a/src/Vehicle/MultiVehicleManager.cc
+++ b/src/Vehicle/MultiVehicleManager.cc
@ -40,7 +40,10 @@
				@@ -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)