diff options
| author | Deven Patel <cdevenp@codeaurora.org> | 2016-03-02 12:49:02 -0800 |
|---|---|---|
| committer | Deven Patel <cdevenp@codeaurora.org> | 2016-03-07 10:52:46 -0800 |
| commit | fa7a874eb0586c7844fe3a4cb8d0063ce53464f0 (patch) | |
| tree | 101a4c80aaacf10706166167e295f5e7001ca800 /utils | |
| parent | a05f77fa0bc52e4af440f8fe3a4b043209396680 (diff) | |
| download | gps-fa7a874eb0586c7844fe3a4cb8d0063ce53464f0.tar.gz | |
Revert "Fix compilation issues for m_master merge into oe_master".
This reverts commit ecb67363ee73c0374424795ae6014a794065f5ab
Change-Id: I7b540247b246ea4caf710247d2c58b55515dae7c
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/LocTimer.h | 2 | ||||
| -rw-r--r-- | utils/Makefile.am | 15 | ||||
| -rw-r--r-- | utils/MsgTask.cpp | 3 | ||||
| -rw-r--r-- | utils/loc_cfg.cpp | 2 | ||||
| -rw-r--r-- | utils/loc_misc_utils.cpp | 2 | ||||
| -rw-r--r-- | utils/loc_timer.h | 2 |
6 files changed, 8 insertions, 18 deletions
diff --git a/utils/LocTimer.h b/utils/LocTimer.h index c6a6362..c146852 100644 --- a/utils/LocTimer.h +++ b/utils/LocTimer.h @@ -31,7 +31,7 @@ #define __LOC_TIMER_CPP_H__ #include <stddef.h> -#include <platform_lib_includes.h> +#include <log_util.h> // opaque class to provide service implementation. class LocTimerDelegate; diff --git a/utils/Makefile.am b/utils/Makefile.am index 50f1007..5e71843 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -14,24 +14,15 @@ libgps_utils_so_la_h_sources = \ loc_cfg.h \ loc_log.h \ loc_target.h \ - loc_timer.h \ - MsgTask.h \ - LocHeap.h \ - LocThread.h \ - LocTimer.h \ - loc_misc_utils.h + loc_timer.h libgps_utils_so_la_c_sources = \ linked_list.c \ msg_q.c \ loc_cfg.cpp \ loc_log.cpp \ - loc_target.cpp \ - LocHeap.cpp \ - LocTimer.cpp \ - LocThread.cpp \ - MsgTask.cpp \ - loc_misc_utils.cpp + loc_timer.c \ + loc_target.cpp library_includedir = $(pkgincludedir)/utils diff --git a/utils/MsgTask.cpp b/utils/MsgTask.cpp index 78a3fe0..f33d602 100644 --- a/utils/MsgTask.cpp +++ b/utils/MsgTask.cpp @@ -33,7 +33,6 @@ #include <MsgTask.h> #include <msg_q.h> #include <loc_log.h> -#include <platform_lib_includes.h> static void LocMsgDestroy(void* msg) { delete (LocMsg*)msg; @@ -78,7 +77,7 @@ void MsgTask::sendMsg(const LocMsg* msg) const { void MsgTask::prerun() { // make sure we do not run in background scheduling group - platform_lib_abstraction_set_sched_policy(platform_lib_abstraction_gettid(), PLA_SP_FOREGROUND); + set_sched_policy(gettid(), SP_FOREGROUND); } bool MsgTask::run() { diff --git a/utils/loc_cfg.cpp b/utils/loc_cfg.cpp index 926781a..967d2f3 100644 --- a/utils/loc_cfg.cpp +++ b/utils/loc_cfg.cpp @@ -38,7 +38,7 @@ #include <unistd.h> #include <time.h> #include <loc_cfg.h> -#include <platform_lib_includes.h> +#include <log_util.h> #include <loc_misc_utils.h> #ifdef USE_GLIB #include <glib.h> diff --git a/utils/loc_misc_utils.cpp b/utils/loc_misc_utils.cpp index dfe19a2..7e96313 100644 --- a/utils/loc_misc_utils.cpp +++ b/utils/loc_misc_utils.cpp @@ -28,7 +28,7 @@ */ #include <stdio.h> #include <string.h> -#include <platform_lib_log_util.h> +#include <log_util.h> #include <loc_misc_utils.h> #include <ctype.h> diff --git a/utils/loc_timer.h b/utils/loc_timer.h index 25fd179..2967858 100644 --- a/utils/loc_timer.h +++ b/utils/loc_timer.h @@ -34,7 +34,7 @@ extern "C" { #endif /* __cplusplus */ #include <stddef.h> -#include <platform_lib_includes.h> + /* user_data: client context pointer, passthrough. Originally received from calling client when loc_timer_start() is called. |