diff --git a/QGCApplication.pro b/QGCApplication.pro
index b31870f830fb12ef0ffcc99e4f62173ede334ecc..328224ef20c096ae4f1894e040d8913d6aea4768 100644
--- a/QGCApplication.pro
+++ b/QGCApplication.pro
@@ -103,9 +103,11 @@ DebugBuild {
     CONFIG += console
 }
 
+!AndroidBuild {
 # qextserialport should not be used by general QGroundControl code. Use QSerialPort instead. This is only
 # here to support special case Firmware Upgrade code.
 include(libs/qextserialport/src/qextserialport.pri)
+}
 
 #
 # External library configuration
@@ -627,12 +629,16 @@ HEADERS+= \
     src/AutoPilotPlugins/PX4/SafetyComponent.h \
     src/AutoPilotPlugins/PX4/SensorsComponent.h \
     src/AutoPilotPlugins/PX4/SensorsComponentController.h \
-    src/VehicleSetup/FirmwareUpgradeController.h \
-    src/VehicleSetup/PX4Bootloader.h \
-    src/VehicleSetup/PX4FirmwareUpgradeThread.h \
     src/VehicleSetup/SetupView.h \
     src/VehicleSetup/VehicleComponent.h \
 
+!AndroidBuild {
+HEADERS += \
+    src/VehicleSetup/FirmwareUpgradeController.h \
+    src/VehicleSetup/PX4Bootloader.h \
+    src/VehicleSetup/PX4FirmwareUpgradeThread.h
+}
+
 SOURCES += \
     src/AutoPilotPlugins/AutoPilotPlugin.cc \
     src/AutoPilotPlugins/AutoPilotPluginManager.cc \
@@ -651,12 +657,16 @@ SOURCES += \
     src/AutoPilotPlugins/PX4/SafetyComponent.cc \
     src/AutoPilotPlugins/PX4/SensorsComponent.cc \
     src/AutoPilotPlugins/PX4/SensorsComponentController.cc \
-    src/VehicleSetup/FirmwareUpgradeController.cc \
-    src/VehicleSetup/PX4Bootloader.cc \
-    src/VehicleSetup/PX4FirmwareUpgradeThread.cc \
     src/VehicleSetup/SetupView.cc \
     src/VehicleSetup/VehicleComponent.cc \
 
+!AndroidBuild {
+SOURCES += \
+    src/VehicleSetup/FirmwareUpgradeController.cc \
+    src/VehicleSetup/PX4Bootloader.cc \
+    src/VehicleSetup/PX4FirmwareUpgradeThread.cc
+}
+
 # Fact System code
 
 INCLUDEPATH += \
diff --git a/src/VehicleSetup/SetupView.cc b/src/VehicleSetup/SetupView.cc
index 65cc0fca200404b515e92cb35ada4e59aa99c70a..31fc188cb1571c8e1e8ff6148f9730c7eb7010ce 100644
--- a/src/VehicleSetup/SetupView.cc
+++ b/src/VehicleSetup/SetupView.cc
@@ -33,7 +33,9 @@
 #include "QGCQmlWidgetHolder.h"
 #include "MainWindow.h"
 #include "QGCMessageBox.h"
+#ifndef __android__
 #include "FirmwareUpgradeController.h"
+#endif
 #include "ParameterEditorController.h"
 
 #include <QQmlError>
@@ -54,7 +56,9 @@ SetupView::SetupView(QWidget* parent) :
     Q_UNUSED(fSucceeded);
     Q_ASSERT(fSucceeded);
     
+#ifndef __android__
     qmlRegisterType<FirmwareUpgradeController>("QGroundControl.Controllers", 1, 0, "FirmwareUpgradeController");
+#endif
 	
     _ui->buttonHolder->rootContext()->setContextProperty("controller", this);
     _ui->buttonHolder->setAutoPilot(NULL);
@@ -116,6 +120,8 @@ void SetupView::_changeSetupWidget(QWidget* newWidget)
 
 void SetupView::firmwareButtonClicked(void)
 {
+#ifndef __android__
+    //FIXME: Hack out for android for now
     if (_uasCurrent && _uasCurrent->isArmed()) {
         QGCMessageBox::warning("Setup", "Firmware Update cannot be performed while vehicle is armed.");
         return;
@@ -127,6 +133,7 @@ void SetupView::firmwareButtonClicked(void)
     setup->setSource(QUrl::fromUserInput("qrc:/qml/FirmwareUpgrade.qml"));
 
     _changeSetupWidget(setup);
+#endif
 }
 
 void SetupView::parametersButtonClicked(void)