From 916ad080828ab9a1939dea0d417eae05c93da849 Mon Sep 17 00:00:00 2001
From: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
Date: Sat, 2 Jan 2021 03:01:09 +0300
Subject: [PATCH] Use system cpu_features and sdbus-cpp

diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index f677aa0..9341a50 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -5,13 +5,4 @@ add_subdirectory(backward-cpp)
 
 set(BUILD_TESTING OFF)
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error")
-add_subdirectory(cpu_features)
-include(ExternalProject)
-ExternalProject_Add(sdbus-cpp
-  PREFIX sdbus-cpp
-  SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/sdbus-cpp"
-  INSTALL_COMMAND ""
-  CMAKE_CACHE_ARGS
-        -DBUILD_CODE_GEN:BOOL=ON
-        -DBUILD_SHARED_LIBS:BOOL=OFF
-)
+

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 796b881..6c59f48 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -59,7 +59,7 @@ add_library(anbox-protobuf
 target_link_libraries(anbox-protobuf
     ${PROTOBUF_LITE_LIBRARIES})
 
-set(XML2CPP ${CMAKE_BINARY_DIR}/external/sdbus-cpp/src/sdbus-cpp-build/tools/sdbus-c++-xml2cpp)
+set(XML2CPP /usr/bin/sdbus-c++-xml2cpp)
 
 macro(DBusServer BaseName)
     add_custom_command(
diff --git a/src/anbox/cmds/check_features.cpp b/src/anbox/cmds/check_features.cpp
index 1e5c745..8abbe9e 100644
--- a/src/anbox/cmds/check_features.cpp
+++ b/src/anbox/cmds/check_features.cpp
@@ -18,9 +18,9 @@
 #include "anbox/cmds/check_features.h"
 #include "anbox/utils.h"
 
-#include "cpu_features_macros.h"
+#include <cpu_features/cpu_features_macros.h>
 #if defined(CPU_FEATURES_ARCH_X86)
-#include "cpuinfo_x86.h"
+#include <cpu_features/cpuinfo_x86.h>
 #endif
 
 namespace {
diff --git a/src/anbox/cmds/system_info.cpp b/src/anbox/cmds/system_info.cpp
index b999417..691f7aa 100644
--- a/src/anbox/cmds/system_info.cpp
+++ b/src/anbox/cmds/system_info.cpp
@@ -30,9 +30,9 @@
 
 #include "OpenGLESDispatch/EGLDispatch.h"
 
-#include "cpu_features_macros.h"
+#include <cpu_features/cpu_features_macros.h>
 #if defined(CPU_FEATURES_ARCH_X86)
-#include "cpuinfo_x86.h"
+#include <cpu_features/cpuinfo_x86.h>
 #endif
 
 namespace fs = boost::filesystem;
diff --git a/src/anbox/dbus/sensors_server.cpp b/src/anbox/dbus/sensors_server.cpp
index 036022b..103c2aa 100644
--- a/src/anbox/dbus/sensors_server.cpp
+++ b/src/anbox/dbus/sensors_server.cpp
@@ -20,7 +20,7 @@
 #include "anbox/android/intent.h"
 #include "anbox/application/sensor_type.h"
 #include "anbox/logger.h"
-#include "sdbus-c++/Error.h"
+#include <sdbus-c++/Error.h>
 
 sdbus::Struct<double, double, double> SensorsServer::Acceleration() {
   if (impl_->disabled_sensors & anbox::application::SensorType::AccelerationSensor)