summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt5
-rw-r--r--packaging/android/build.sh1
2 files changed, 1 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c34efb32c..c53846788 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -158,11 +158,6 @@ if(FTDISUPPORT)
add_definitions(-DSERIAL_FTDI)
endif()
-if(ANDROID)
- set(FBSUPPORT OFF)
- set(NO_PRINTING ON)
-endif()
-
# setup Grantlee
if(NO_PRINTING)
diff --git a/packaging/android/build.sh b/packaging/android/build.sh
index c3efa5bf1..b03bfef19 100644
--- a/packaging/android/build.sh
+++ b/packaging/android/build.sh
@@ -298,6 +298,7 @@ cmake $MOBILE_CMAKE \
-DNO_MARBLE=ON \
-DNO_PRINTING=ON \
-DNO_USERMANUAL=ON \
+ -DFBSUPPORT=OFF \
-DCMAKE_PREFIX_PATH:UNINITIALIZED=${QT5_ANDROID}/android_${QT_ARCH}/lib/cmake \
-DCMAKE_BUILD_TYPE=Debug \
-DFTDISUPPORT=${FTDI} \