commit 44bbff64196ee5d9ce16ad8543417a8a075d31aa
author Suren Baghdasaryan <surenb@google.com> Thu Jan 24 06:57:55 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 24 06:57:55 2019 +0000
tree 24235f53734b0f7928298631da5a2337247d721b
parent 6efc6872a705f34e31eb604da0c926fe47823367
parent b3eff8aff1031b0c3f55f16dfe1d1b4f4b84a6ae

Merge "DO NOT MERGE: Revert "ART: add libprocessgroup dependency and fix sched_policy include""

runtime/Android.bp

diff --git a/runtime/Android.bp b/runtime/Android.bp
index a3081e9..b89eb02 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -396,10 +396,8 @@
         "libnativeloader",
         "libbacktrace",
         "liblog",
-        // For atrace, properties, ashmem.
+        // For atrace, properties, ashmem, set_sched_policy.
         "libcutils",
-        // For set_sched_policy.
-        "libprocessgroup",
         // For common macros.
         "libbase",
     ],

runtime/thread_android.cc

diff --git a/runtime/thread_android.cc b/runtime/thread_android.cc
index 24864f9..8ff6c52 100644
--- a/runtime/thread_android.cc
+++ b/runtime/thread_android.cc
@@ -21,7 +21,7 @@
 #include <sys/resource.h>
 #include <sys/time.h>
 
-#include <processgroup/sched_policy.h>
+#include <cutils/sched_policy.h>
 #include <utils/threads.h>
 
 #include "base/macros.h"