Luca Weiss
8c2a95dbe2
* Mir starts up and is able to display system settings
* x86_64 only for now, because at least ubuntu-app-test did not build
on aarch64
Based on PureTryOut's work. Getting it to this stage was a huge effort
(as it shows in the package count: 111(!)). See the merge request for
details.
[skip ci]: this won't finish in CI; ollieparanoid made sure that
everything builds for x86_64.
79 lines
2.5 KiB
Diff
79 lines
2.5 KiB
Diff
From ad7848c68e447c9abfb6507f3fe42c120ea098cf Mon Sep 17 00:00:00 2001
|
|
From: Luca Weiss <luca@z3ntu.xyz>
|
|
Date: Tue, 29 Jan 2019 19:21:04 +0100
|
|
Subject: [PATCH 1/5] AndroidAway
|
|
|
|
---
|
|
plugins/Lights/CMakeLists.txt | 20 +-------------------
|
|
src/CMakeLists.txt | 2 +-
|
|
src/ShellApplication.cpp | 8 ++++----
|
|
3 files changed, 6 insertions(+), 24 deletions(-)
|
|
|
|
diff --git a/plugins/Lights/CMakeLists.txt b/plugins/Lights/CMakeLists.txt
|
|
index 22365f6e2..d86f132d1 100644
|
|
--- a/plugins/Lights/CMakeLists.txt
|
|
+++ b/plugins/Lights/CMakeLists.txt
|
|
@@ -1,19 +1 @@
|
|
-pkg_check_modules(ANDROID_HEADERS REQUIRED android-headers)
|
|
-pkg_check_modules(ANDROID_HARDWARE REQUIRED libhardware)
|
|
-
|
|
-include_directories(
|
|
- SYSTEM
|
|
- ${ANDROID_HEADERS_INCLUDE_DIRS}
|
|
-)
|
|
-
|
|
-add_library(Lights-qml MODULE
|
|
- plugin.cpp
|
|
- Lights.cpp
|
|
- )
|
|
-
|
|
-target_link_libraries(Lights-qml
|
|
- Qt5::Qml Qt5::Gui
|
|
- ${ANDROID_HARDWARE_LIBRARIES}
|
|
- )
|
|
-
|
|
-add_unity8_plugin(Lights 0.1 Lights TARGETS Lights-qml)
|
|
+message("Sorry")
|
|
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
|
|
index fc0c9ca9b..8dd6614f5 100644
|
|
--- a/src/CMakeLists.txt
|
|
+++ b/src/CMakeLists.txt
|
|
@@ -42,7 +42,7 @@ if (ENABLE_TOUCH_EMULATION)
|
|
set(SOURCE_FILES ${SOURCE_FILES} MouseTouchAdaptor.cpp)
|
|
endif()
|
|
|
|
-pkg_check_modules(ANDROID_PROPERTIES REQUIRED libandroid-properties)
|
|
+#pkg_check_modules(ANDROID_PROPERTIES REQUIRED libandroid-properties) # No Android, I desktop
|
|
add_executable(${SHELL_APP} ${SOURCE_FILES})
|
|
|
|
if (NOT "${ANDROID_PROPERTIES_INCLUDE_DIRS}" STREQUAL "")
|
|
diff --git a/src/ShellApplication.cpp b/src/ShellApplication.cpp
|
|
index d7365ca37..c1181cc6f 100644
|
|
--- a/src/ShellApplication.cpp
|
|
+++ b/src/ShellApplication.cpp
|
|
@@ -26,7 +26,7 @@
|
|
#include <libintl.h>
|
|
|
|
// libandroid-properties
|
|
-#include <hybris/properties/properties.h>
|
|
+//#include <hybris/properties/properties.h> // I no Android, I disk top
|
|
|
|
// local
|
|
#include <paths.h>
|
|
@@ -49,9 +49,9 @@ ShellApplication::ShellApplication(int & argc, char ** argv, bool isMirServer)
|
|
if (!parser.deviceName().isEmpty()) {
|
|
m_deviceName = parser.deviceName();
|
|
} else {
|
|
- char buffer[200];
|
|
- property_get("ro.product.device", buffer /* value */, "desktop" /* default_value*/);
|
|
- m_deviceName = QString(buffer);
|
|
+ //char buffer[200];
|
|
+ //property_get("ro.product.device", buffer /* value */, "desktop" /* default_value*/);
|
|
+ //m_deviceName = QString(buffer); // I still no Vedroid
|
|
}
|
|
m_qmlArgs.setDeviceName(m_deviceName);
|
|
|
|
--
|
|
2.20.1
|
|
|