Description: Fix build without libandroid-properties-dev and android-headers (libhybris).
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Forwarded: https://gitlab.com/ubports/development/core/repowerd/-/merge_requests/41

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,6 +25,7 @@
 option(REPOWERD_DISABLE_TIME_SENSITIVE_TESTS "Don't run time-sensitive tests" OFF)
 
 option(REPOWERD_ENABLE_HYBRIS "Enable hybris support" ON)
+option(REPOWERD_ENABLE_ANDROID_PROPERTIES "Enable Android properties" ON)
 
 # Work around cmake setting conf dir to "/usr/etc" instead of "/etc"
 # when prefix is "/usr"
@@ -37,11 +38,12 @@
 find_package(Threads REQUIRED)
 find_package(PkgConfig REQUIRED)
 
-pkg_check_modules(ANDROID_PROPERTIES REQUIRED libandroid-properties)
+
 pkg_check_modules(GIO REQUIRED gio-2.0)
 pkg_check_modules(GIO_UNIX REQUIRED gio-unix-2.0)
 
 if (REPOWERD_ENABLE_HYBRIS)
+    pkg_check_modules(ANDROID_PROPERTIES REQUIRED libandroid-properties)
     pkg_check_modules(UA REQUIRED ubuntu-platform-api)
     pkg_check_modules(LIBHARDWARE REQUIRED libhardware)
     pkg_check_modules(UBUNTU_PLATFORM_HARDWARE_API REQUIRED ubuntu-platform-hardware-api)
--- a/src/adapters/CMakeLists.txt
+++ b/src/adapters/CMakeLists.txt
@@ -18,7 +18,10 @@
 
 if (REPOWERD_ENABLE_HYBRIS)
     set(REPOWERD_ADAPTER_HYBRIS_SRCS
+        android_autobrightness_algorithm.cpp
         android_backlight.cpp
+        android_device_config.cpp
+        android_device_quirks.cpp
         dev_alarm_wakeup_service.cpp
         ubuntu_light_sensor.cpp
         ubuntu_performance_booster.cpp
@@ -29,9 +32,6 @@
 set(
     REPOWERD_ADAPTER_SRCS
 
-    android_autobrightness_algorithm.cpp
-    android_device_config.cpp
-    android_device_quirks.cpp
     backlight_brightness_control.cpp
     brightness_params.cpp
     console_log.cpp
@@ -63,6 +63,7 @@
     upower_power_source_and_lid.cpp
 
     ${REPOWERD_ADAPTER_HYBRIS_SRCS}
+
 )
 
 add_library(
--- a/tests/adapter-tests/CMakeLists.txt
+++ b/tests/adapter-tests/CMakeLists.txt
@@ -15,10 +15,16 @@
 # Authored by: Alexandros Frantzis <alexandros.frantzis@canonical.com>
 
 if (REPOWERD_ENABLE_HYBRIS)
+    add_definition("-DREPOWERD_ENABLE_HYBRIS")
+
     set(REPOWERD_ADAPTER_TEST_HYBRIS_SRCS
         fake_libhardware.cpp
+        fake_android_properties.cpp
 
+        test_android_autobrightness_algorithm.cpp
         test_android_backlight.cpp
+        test_android_device_config.cpp
+        test_android_device_quirks.cpp
         test_dev_alarm_wakeup_service.cpp
         test_ubuntu_light_sensor.cpp
         test_ubuntu_proximity_sensor.cpp
@@ -31,7 +37,6 @@
     current_thread_name.cpp
     dbus_bus.cpp
     dbus_client.cpp
-    fake_android_properties.cpp
     fake_brightness_notification.cpp
     fake_chrono.cpp
     fake_device_config.cpp
@@ -47,9 +52,6 @@
     temporary_file.cpp
     unity_screen_dbus_client.cpp
 
-    test_android_autobrightness_algorithm.cpp
-    test_android_device_config.cpp
-    test_android_device_quirks.cpp
     test_backlight_brightness_control.cpp
     test_brightness_params.cpp
     test_dbus_event_loop.cpp
@@ -77,6 +79,8 @@
     test_upower_power_source_and_lid.cpp
 
     ${REPOWERD_ADAPTER_TEST_HYBRIS_SRCS}
+    ${REPOWERD_ADAPTER_ANDROID_PROPERTIES_SRCS}
+
 )
 
 target_link_libraries(
--- a/src/adapters/default_state_machine_options.cpp
+++ b/src/adapters/default_state_machine_options.cpp
@@ -20,7 +20,9 @@
 #include "src/core/log.h"
 #include "src/core/infinite_timeout.h"
 
+#ifdef REPOWERD_ENABLE_HYBRIS
 #include <hybris/properties/properties.h>
+#endif
 
 using namespace std::chrono_literals;
 
@@ -31,9 +33,13 @@
 
 std::string determine_device_name()
 {
+#ifdef REPOWERD_ENABLE_HYBRIS
     char name[PROP_VALUE_MAX] = "";
     property_get("ro.product.device", name, "");
     return name;
+#else
+    return "";
+#endif
 }
 
 bool treat_power_button_as_user_activity_for(
--- a/src/default_daemon_config.cpp
+++ b/src/default_daemon_config.cpp
@@ -21,9 +21,6 @@
 #include "src/core/performance_booster.h"
 #include "src/core/proximity_sensor.h"
 
-#include "adapters/android_autobrightness_algorithm.h"
-#include "adapters/android_device_config.h"
-#include "adapters/android_device_quirks.h"
 #include "adapters/backlight_brightness_control.h"
 #include "adapters/console_log.h"
 #include "adapters/default_state_machine_options.h"
@@ -49,7 +46,10 @@
 
 // Hybris
 #ifdef REPOWERD_ENABLE_HYBRIS
+#include "adapters/android_autobrightness_algorithm.h"
 #include "adapters/android_backlight.h"
+#include "adapters/android_device_config.h"
+#include "adapters/android_device_quirks.h"
 #include "adapters/dev_alarm_wakeup_service.h"
 #include "adapters/ubuntu_light_sensor.h"
 #include "adapters/ubuntu_performance_booster.h"
@@ -415,6 +415,7 @@
 {
     if (!backlight_brightness_control)
     {
+#ifdef REPOWERD_ENABLE_HYBRIS
         auto const ab_log_env_cstr = getenv("REPOWERD_LOG_AUTOBRIGHTNESS");
         std::string const ab_log_env{ab_log_env_cstr ? ab_log_env_cstr : ""};
 
@@ -428,6 +429,7 @@
             the_log(),
             *the_device_config(),
             *the_device_quirks());
+#endif
     }
 
     return backlight_brightness_control;
@@ -474,6 +476,7 @@
 {
     if (!device_config)
     {
+#ifdef REPOWERD_ENABLE_HYBRIS
         auto const dir_env_cstr = getenv("REPOWERD_DEVICE_CONFIG_DIR");
         std::string const dir_env{dir_env_cstr ? dir_env_cstr : ""};
 
@@ -490,6 +493,7 @@
             the_log(),
             the_filesystem(),
             device_config_dirs);
+#endif
     }
 
     return device_config;
@@ -499,8 +503,11 @@
 repowerd::DefaultDaemonConfig::the_device_quirks()
 {
     if (!device_quirks)
+    {
+#ifdef REPOWERD_ENABLE_HYBRIS
         device_quirks = std::make_shared<AndroidDeviceQuirks>(*the_log());
-
+#endif
+    }
     return device_quirks;
 }
 
--- a/tests/adapter-tests/test_default_state_machine_options.cpp
+++ b/tests/adapter-tests/test_default_state_machine_options.cpp
@@ -18,7 +18,9 @@
 
 #include "src/adapters/default_state_machine_options.h"
 
+#ifdef REPOWERD_ENABLE_HYBRIS
 #include "fake_android_properties.h"
+#endif
 #include "fake_log.h"
 
 #include <gtest/gtest.h>
@@ -43,15 +45,20 @@
 {
     void set_device_name()
     {
+#ifdef REPOWERD_ENABLE_HYBRIS
         fake_android_properties.set("ro.product.device", "device");
+#endif
     }
 
+#ifdef REPOWERD_ENABLE_HYBRIS
     rt::FakeAndroidProperties fake_android_properties;
+#endif
     rt::FakeLog fake_log;
 };
 
 }
 
+#ifdef REPOWERD_ENABLE_HYBRIS
 TEST_F(ADefaultStateMachineOptions,
        treat_power_button_as_user_activity_is_false_if_device_has_a_name)
 {
@@ -60,6 +67,7 @@
 
     EXPECT_FALSE(default_state_machine_options.treat_power_button_as_user_activity());
 }
+#endif
 
 TEST_F(ADefaultStateMachineOptions,
        treat_power_button_as_user_activity_is_true_if_device_does_not_have_a_name)