From f145309d9c1549b06029bb00a3d5fe2bf459ed02 Mon Sep 17 00:00:00 2001
From: Suren Baghdasaryan <surenb@google.com>
Date: Wed, 23 Jan 2019 20:53:17 -0800
Subject: DO NOT MERGE: Revert "Add libprocessgroup dependency and fix
 sched_policy include"

This reverts commit dc9078de949983a91b04dedc78e4089645f8626d.

Reason for revert: Broke AOSP

Change-Id: Ia5cb6e8f829669a6e0dd01260605b986a1282c85
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
---
 services/surfaceflinger/Android.bp              | 3 ---
 services/surfaceflinger/main_surfaceflinger.cpp | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

(limited to 'services')

diff --git a/services/surfaceflinger/Android.bp b/services/surfaceflinger/Android.bp
index 22e7761323..ce4daa5f35 100644
--- a/services/surfaceflinger/Android.bp
+++ b/services/surfaceflinger/Android.bp
@@ -44,7 +44,6 @@ cc_defaults {
         "liblayers_proto",
         "liblog",
         "libpdx_default_transport",
-        "libprocessgroup",
         "libprotobuf-cpp-lite",
         "libsync",
         "libtimestats_proto",
@@ -174,7 +173,6 @@ cc_binary {
         "libhidltransport",
         "liblayers_proto",
         "liblog",
-        "libprocessgroup",
         "libsurfaceflinger",
         "libtimestats_proto",
         "libutils",
@@ -207,7 +205,6 @@ cc_library_shared {
         "libcutils",
         "libdl",
         "liblog",
-        "libprocessgroup",
     ],
     product_variables: {
         // uses jni which may not be available in PDK
diff --git a/services/surfaceflinger/main_surfaceflinger.cpp b/services/surfaceflinger/main_surfaceflinger.cpp
index aefe7048e7..d0900e9a5a 100644
--- a/services/surfaceflinger/main_surfaceflinger.cpp
+++ b/services/surfaceflinger/main_surfaceflinger.cpp
@@ -21,13 +21,13 @@
 #include <android/frameworks/displayservice/1.0/IDisplayService.h>
 #include <android/hardware/configstore/1.0/ISurfaceFlingerConfigs.h>
 #include <android/hardware/graphics/allocator/2.0/IAllocator.h>
+#include <cutils/sched_policy.h>
 #include <binder/IServiceManager.h>
 #include <binder/IPCThreadState.h>
 #include <binder/ProcessState.h>
 #include <binder/IServiceManager.h>
 #include <displayservice/DisplayService.h>
 #include <hidl/LegacySupport.h>
-#include <processgroup/sched_policy.h>
 #include <configstore/Utils.h>
 #include "SurfaceFlinger.h"
 
-- 
cgit v1.2.3-59-g8ed1b