Fix android build

f0529fd1 · Don Gagne · cc79fff0 · f0529fd1 · f0529fd1 · f0529fd1
Commit f0529fd1 authored Mar 13, 2016 by Don Gagne
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 5 deletions

qgroundcontrol.pro qgroundcontrol.pro +1 -1

MobileScreenMgr.cc src/MobileScreenMgr.cc +2 -0

MultiVehicleManager.cc src/Vehicle/MultiVehicleManager.cc +0 -4

No files found.
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -369,7 +369,7 @@ iOSBuild {
        src/audio/QGCAudioWorker_iOS.mm \
        src/MobileScreenMgr.mm \
 }
-androidBuild {
+AndroidBuild {
    SOURCES += src/MobileScreenMgr.cc \
 }


--- a/src/MobileScreenMgr.cc
+++ b/src/MobileScreenMgr.cc
@@ -26,6 +26,8 @@
 #include <QtAndroidExtras/QtAndroidExtras>
 #include <QtAndroidExtras/QAndroidJniObject>

+static const char* kJniClassName = "org/qgroundcontrol/qgchelper/UsbDeviceJNI";
+
 void MobileScreenMgr::setKeepScreenOn(bool keepScreenOn)
 {
    if (keepScreenOn) {

--- a/src/Vehicle/MultiVehicleManager.cc
+++ b/src/Vehicle/MultiVehicleManager.cc
@@ -40,10 +40,6 @@ 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)
    , _activeVehicleAvailable(false)