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>
---
 cmds/installd/Android.bp                        | 3 ---
 cmds/installd/dexopt.cpp                        | 1 -
 cmds/installd/tests/Android.bp                  | 3 ---
 libs/vr/libvrflinger/Android.bp                 | 1 -
 libs/vr/libvrflinger/vr_flinger.cpp             | 2 +-
 services/surfaceflinger/Android.bp              | 3 ---
 services/surfaceflinger/main_surfaceflinger.cpp | 2 +-
 7 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/cmds/installd/Android.bp b/cmds/installd/Android.bp
index a6f77aa086..f574752d21 100644
--- a/cmds/installd/Android.bp
+++ b/cmds/installd/Android.bp
@@ -31,7 +31,6 @@ cc_defaults {
         "libcutils",
         "liblog",
         "liblogwrap",
-        "libprocessgroup",
         "libselinux",
         "libutils",
     ],
@@ -170,7 +169,6 @@ cc_library_static {
         "libbase",
         "libcutils",
         "liblog",
-        "libprocessgroup",
         "libutils",
     ],
 }
@@ -208,7 +206,6 @@ cc_binary {
         "libcutils",
         "liblog",
         "liblogwrap",
-        "libprocessgroup",
         "libselinux",
         "libutils",
     ],
diff --git a/cmds/installd/dexopt.cpp b/cmds/installd/dexopt.cpp
index e3a35c71d4..10110a80b5 100644
--- a/cmds/installd/dexopt.cpp
+++ b/cmds/installd/dexopt.cpp
@@ -43,7 +43,6 @@
 #include <log/log.h>               // TODO: Move everything to base/logging.
 #include <openssl/sha.h>
 #include <private/android_filesystem_config.h>
-#include <processgroup/sched_policy.h>
 #include <selinux/android.h>
 #include <system/thread_defs.h>
 
diff --git a/cmds/installd/tests/Android.bp b/cmds/installd/tests/Android.bp
index 9c9db0f21d..739f33f50f 100644
--- a/cmds/installd/tests/Android.bp
+++ b/cmds/installd/tests/Android.bp
@@ -28,7 +28,6 @@ cc_test {
         "libbinder",
         "libcrypto",
         "libcutils",
-        "libprocessgroup",
         "libselinux",
         "libutils",
     ],
@@ -51,7 +50,6 @@ cc_test {
         "libbinder",
         "libcrypto",
         "libcutils",
-        "libprocessgroup",
         "libselinux",
         "libutils",
     ],
@@ -74,7 +72,6 @@ cc_test {
         "libbinder",
         "libcrypto",
         "libcutils",
-        "libprocessgroup",
         "libselinux",
         "libutils",
     ],
diff --git a/libs/vr/libvrflinger/Android.bp b/libs/vr/libvrflinger/Android.bp
index 26e8201251..233e0fceaa 100644
--- a/libs/vr/libvrflinger/Android.bp
+++ b/libs/vr/libvrflinger/Android.bp
@@ -47,7 +47,6 @@ sharedLibraries = [
     "liblog",
     "libhardware",
     "libnativewindow",
-    "libprocessgroup",
     "libutils",
     "libEGL",
     "libGLESv1_CM",
diff --git a/libs/vr/libvrflinger/vr_flinger.cpp b/libs/vr/libvrflinger/vr_flinger.cpp
index a27d58d252..26aed4f25f 100644
--- a/libs/vr/libvrflinger/vr_flinger.cpp
+++ b/libs/vr/libvrflinger/vr_flinger.cpp
@@ -12,9 +12,9 @@
 #include <binder/IServiceManager.h>
 #include <binder/ProcessState.h>
 #include <cutils/properties.h>
+#include <cutils/sched_policy.h>
 #include <log/log.h>
 #include <private/dvr/display_client.h>
-#include <processgroup/sched_policy.h>
 #include <sys/prctl.h>
 #include <sys/resource.h>
 
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