DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
Bug: 120848293
Change-Id: I2762ab321bdd082f15b517453eeb6c9b90bbed8a
diff --git a/core/Android.mk b/core/Android.mk
index 58c4a12..859ac03 100644
--- a/core/Android.mk
+++ b/core/Android.mk
@@ -20,7 +20,8 @@
libutils \
libcutils \
libgps.utils \
- libdl
+ libdl \
+ libprocessgroup
LOCAL_SRC_FILES += \
MsgTask.cpp \
diff --git a/loc_api/libloc_api_50001/Android.mk b/loc_api/libloc_api_50001/Android.mk
index 74d5423..4992540 100644
--- a/loc_api/libloc_api_50001/Android.mk
+++ b/loc_api/libloc_api_50001/Android.mk
@@ -16,7 +16,8 @@
libdl \
liblog \
libloc_core \
- libgps.utils
+ libgps.utils \
+ libprocessgroup
LOCAL_SRC_FILES += \
loc_eng.cpp \
@@ -74,7 +75,8 @@
libloc_eng \
libloc_core \
libgps.utils \
- libdl
+ libdl \
+ libprocessgroup
ifneq ($(filter $(TARGET_DEVICE), apq8084 msm8960), false)
endif
diff --git a/msm8084/core/Android.mk b/msm8084/core/Android.mk
index c7ea75c..e1df540 100644
--- a/msm8084/core/Android.mk
+++ b/msm8084/core/Android.mk
@@ -15,7 +15,8 @@
liblog \
libcutils \
libgps.utils \
- libdl
+ libdl \
+ libprocessgroup
LOCAL_SRC_FILES += \
MsgTask.cpp \
diff --git a/msm8084/loc_api/libloc_api_50001/Android.mk b/msm8084/loc_api/libloc_api_50001/Android.mk
index e38befa..87b248e 100644
--- a/msm8084/loc_api/libloc_api_50001/Android.mk
+++ b/msm8084/loc_api/libloc_api_50001/Android.mk
@@ -16,7 +16,8 @@
libdl \
liblog \
libloc_core \
- libgps.utils
+ libgps.utils \
+ libprocessgroup
LOCAL_SRC_FILES += \
loc_eng.cpp \
@@ -74,7 +75,8 @@
libloc_eng \
libloc_core \
libgps.utils \
- libdl
+ libdl \
+ libprocessgroup
LOCAL_SRC_FILES += \
loc.cpp \
diff --git a/msm8909/loc_api/libloc_api_50001/Android.mk b/msm8909/loc_api/libloc_api_50001/Android.mk
index 2353a37..08835d6 100644
--- a/msm8909/loc_api/libloc_api_50001/Android.mk
+++ b/msm8909/loc_api/libloc_api_50001/Android.mk
@@ -16,7 +16,8 @@
libdl \
liblog \
libloc_core \
- libgps.utils
+ libgps.utils \
+ libprocessgroup
LOCAL_SRC_FILES += \
loc_eng.cpp \
@@ -75,7 +76,8 @@
libloc_eng \
libloc_core \
libgps.utils \
- libdl
+ libdl \
+ libprocessgroup
ifneq ($(filter $(TARGET_DEVICE), apq8084 msm8960), false)
endif
diff --git a/msm8909/utils/Android.mk b/msm8909/utils/Android.mk
index 289926c..b7e30fb 100644
--- a/msm8909/utils/Android.mk
+++ b/msm8909/utils/Android.mk
@@ -10,7 +10,8 @@
LOCAL_SHARED_LIBRARIES := \
libutils \
libcutils \
- liblog
+ liblog \
+ libprocessgroup
LOCAL_SRC_FILES += \
loc_log.cpp \
diff --git a/msm8960/core/Android.mk b/msm8960/core/Android.mk
index 3144313..dc2b31a 100644
--- a/msm8960/core/Android.mk
+++ b/msm8960/core/Android.mk
@@ -12,7 +12,8 @@
liblog \
libcutils \
libgps.utils \
- libdl
+ libdl \
+ libprocessgroup
LOCAL_SRC_FILES += \
MsgTask.cpp \
diff --git a/msm8960/loc_api/libloc_api_50001/Android.mk b/msm8960/loc_api/libloc_api_50001/Android.mk
index b9a63b0..9f60c5d 100644
--- a/msm8960/loc_api/libloc_api_50001/Android.mk
+++ b/msm8960/loc_api/libloc_api_50001/Android.mk
@@ -16,7 +16,8 @@
libdl \
liblog \
libloc_core \
- libgps.utils
+ libgps.utils \
+ libprocessgroup
LOCAL_SRC_FILES += \
loc_eng.cpp \
@@ -74,7 +75,8 @@
libloc_eng \
libloc_core \
libgps.utils \
- libdl
+ libdl \
+ libprocessgroup
LOCAL_SRC_FILES += \
loc.cpp \
diff --git a/msm8994/core/Android.mk b/msm8994/core/Android.mk
index 46d5343..a8b8995 100644
--- a/msm8994/core/Android.mk
+++ b/msm8994/core/Android.mk
@@ -21,7 +21,8 @@
liblog \
libcutils \
libgps.utils \
- libdl
+ libdl \
+ libprocessgroup
LOCAL_SRC_FILES += \
MsgTask.cpp \
diff --git a/msm8994/loc_api/libloc_api_50001/Android.mk b/msm8994/loc_api/libloc_api_50001/Android.mk
index 74d5423..4992540 100644
--- a/msm8994/loc_api/libloc_api_50001/Android.mk
+++ b/msm8994/loc_api/libloc_api_50001/Android.mk
@@ -16,7 +16,8 @@
libdl \
liblog \
libloc_core \
- libgps.utils
+ libgps.utils \
+ libprocessgroup
LOCAL_SRC_FILES += \
loc_eng.cpp \
@@ -74,7 +75,8 @@
libloc_eng \
libloc_core \
libgps.utils \
- libdl
+ libdl \
+ libprocessgroup
ifneq ($(filter $(TARGET_DEVICE), apq8084 msm8960), false)
endif
diff --git a/msm8996/loc_api/libloc_api_50001/Android.mk b/msm8996/loc_api/libloc_api_50001/Android.mk
index 5182318..c517a23 100644
--- a/msm8996/loc_api/libloc_api_50001/Android.mk
+++ b/msm8996/loc_api/libloc_api_50001/Android.mk
@@ -17,7 +17,8 @@
libdl \
liblog \
libloc_core \
- libgps.utils
+ libgps.utils \
+ libprocessgroup
LOCAL_SRC_FILES += \
loc_eng.cpp \
@@ -74,7 +75,8 @@
libloc_eng \
libloc_core \
libgps.utils \
- libdl
+ libdl \
+ libprocessgroup
ifneq ($(filter $(TARGET_DEVICE), apq8084 msm8960), false)
endif
diff --git a/msm8996/utils/Android.mk b/msm8996/utils/Android.mk
index a322d0f..f347d47 100644
--- a/msm8996/utils/Android.mk
+++ b/msm8996/utils/Android.mk
@@ -10,7 +10,8 @@
LOCAL_SHARED_LIBRARIES := \
libutils \
libcutils \
- liblog
+ liblog \
+ libprocessgroup
LOCAL_SRC_FILES += \
loc_log.cpp \
diff --git a/msm8998/utils/Android.mk b/msm8998/utils/Android.mk
index ff18f2f..b97dad3 100644
--- a/msm8998/utils/Android.mk
+++ b/msm8998/utils/Android.mk
@@ -12,7 +12,8 @@
libutils \
libcutils \
liblog \
- libloc_pla
+ libloc_pla \
+ libprocessgroup
LOCAL_SRC_FILES += \
loc_log.cpp \
diff --git a/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk b/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk
index 0d2afe7..c029bc7 100644
--- a/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk
+++ b/msm8998/utils/platform_lib_abstractions/loc_pla/src/Android.mk
@@ -11,7 +11,8 @@
libutils \
libcutils \
liblog \
- libloc_stub
+ libloc_stub \
+ libprocessgroup
LOCAL_SRC_FILES += \
platform_lib_gettid.cpp \
diff --git a/sdm845/utils/Android.mk b/sdm845/utils/Android.mk
index 093b88c..40882a7 100644
--- a/sdm845/utils/Android.mk
+++ b/sdm845/utils/Android.mk
@@ -11,7 +11,8 @@
LOCAL_SHARED_LIBRARIES := \
libutils \
libcutils \
- liblog
+ liblog \
+ libprocessgroup
LOCAL_SRC_FILES += \
loc_log.cpp \
diff --git a/sdm845/utils/MsgTask.cpp b/sdm845/utils/MsgTask.cpp
index eaead5c..5f73f00 100644
--- a/sdm845/utils/MsgTask.cpp
+++ b/sdm845/utils/MsgTask.cpp
@@ -35,6 +35,7 @@
#include <log_util.h>
#include <loc_log.h>
#include <loc_pla.h>
+#include <processgroup/sched_policy.h>
static void LocMsgDestroy(void* msg) {
delete (LocMsg*)msg;