From 10f43711159747cf8966a5a566d86fa0159a7066 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Thu, 29 Oct 2015 17:26:38 -0700
Subject: [PATCH] Fix android build

---
 src/Joystick/Joystick.cc | 1 +
 src/comm/SerialLink.cc   | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/Joystick/Joystick.cc b/src/Joystick/Joystick.cc
index e35eaf025..9c10ca70b 100644
--- a/src/Joystick/Joystick.cc
+++ b/src/Joystick/Joystick.cc
@@ -75,6 +75,7 @@ Joystick::Joystick(const QString& name, int axisCount, int buttonCount, int sdlI
     Q_UNUSED(axisCount)
     Q_UNUSED(buttonCount)
     Q_UNUSED(sdlIndex)
+    Q_UNUSED(multiVehicleManager)
 #else
     _rgAxisValues = new int[_axisCount];
     _rgCalibration = new Calibration_t[_axisCount];
diff --git a/src/comm/SerialLink.cc b/src/comm/SerialLink.cc
index 73e0755e7..4541f893d 100644
--- a/src/comm/SerialLink.cc
+++ b/src/comm/SerialLink.cc
@@ -25,6 +25,7 @@
 #include "QGC.h"
 #include "MG.h"
 #include "QGCLoggingCategory.h"
+#include "QGCApplication.h"
 
 QGC_LOGGING_CATEGORY(SerialLinkLog, "SerialLinkLog")
 
-- 
2.22.0