DO NOT MERGE: Revert "Revert "Add libprocessgroup dependency and fix sched_policy...

This reverts commit e5751caf675fc0bee229f8c427564c2e927184fd.

Reason for revert: AOSP is fixed with new vendor image

Change-Id: I96db6ffe9cce3d5158b96c171026839d62ec3756
Signed-off-by: Suren Baghdasaryan <surenb@google.com>

diff --git a/btif/Android.bp b/btif/Android.bp
index 75d962d..e58e19d 100644 (file)
--- a/btif/Android.bp
+++ b/btif/Android.bp
@@ -130,6 +130,7 @@ cc_test {
         "liblog",
         "libprotobuf-cpp-lite",
         "libcutils",
+        "libprocessgroup",
         "libutils",
         "libcrypto",
     ],

diff --git a/main/Android.bp b/main/Android.bp
index 05b0a5f..1e9c243 100644 (file)
--- a/main/Android.bp
+++ b/main/Android.bp
@@ -47,6 +47,7 @@ cc_library_shared {
         "libhidltransport",
         "libhwbinder",
         "liblog",
+        "libprocessgroup",
         "libprotobuf-cpp-lite",
         "libutils",
         "libtinyxml2",

diff --git a/utils/Android.bp b/utils/Android.bp
index 6a6c510..3a40750 100644 (file)
--- a/utils/Android.bp
+++ b/utils/Android.bp
@@ -12,4 +12,7 @@ cc_library_static {
         "system/bt/stack/include",
     ],
     srcs: ["src/bt_utils.cc"],
+    shared_libs: [
+        "libprocessgroup",
+    ],
 }

diff --git a/utils/src/bt_utils.cc b/utils/src/bt_utils.cc
index 6d93ac4..fda47f6 100644 (file)
--- a/utils/src/bt_utils.cc
+++ b/utils/src/bt_utils.cc
@@ -39,7 +39,7 @@
 
 #define A2DP_RT_PRIORITY 1
 #ifndef OS_GENERIC
-#include <cutils/sched_policy.h>
+#include <processgroup/sched_policy.h>
 #endif
 
 #include "bt_types.h"