Skip to content

Q
qgroundcontrol
Commit 2b23d05c authored by dogmaphobic's avatar dogmaphobic
Browse files
Options

Merge conflict fix missed the Android only variable.

parent bd34b73a
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
src/Vehicle/MultiVehicleManager.cc
View file @ 2b23d05c
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment