From 09a29e161f6a240da19d550b267e0ed0f02d37a0 Mon Sep 17 00:00:00 2001
From: Suren Baghdasaryan <surenb@google.com>
Date: Fri, 4 Jan 2019 12:16:57 -0800
Subject: [PATCH 1/2] Add libprocessgroup dependency and fix sched_policy
 include

Because android_runtime is using set_sched_policy which is moved
into libprocessgroup an additional dependency is added and header
file change is made.

Exempt-From-Owner-Approval: janitorial

Bug: 111307099
Test: builds, boots
Merged-In: I98a7a6f9a9d6be8595b3604fb73dafc05412c482
Change-Id: I98a7a6f9a9d6be8595b3604fb73dafc05412c482
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
---
 core/jni/android_util_Process.cpp           | 2 +-
 core/jni/com_android_internal_os_Zygote.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp
index 62aa1f38ca30b..978254175da48 100644
--- a/core/jni/android_util_Process.cpp
+++ b/core/jni/android_util_Process.cpp
@@ -22,10 +22,10 @@
 #include <utils/Log.h>
 #include <binder/IPCThreadState.h>
 #include <binder/IServiceManager.h>
-#include <cutils/sched_policy.h>
 #include <utils/String8.h>
 #include <utils/Vector.h>
 #include <processgroup/processgroup.h>
+#include <processgroup/sched_policy.h>
 
 #include "core_jni_helpers.h"
 
diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index d4fe1edf0e7a1..691027dbf83d6 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -53,13 +53,13 @@
 #include <android-base/stringprintf.h>
 #include <cutils/fs.h>
 #include <cutils/multiuser.h>
-#include <cutils/sched_policy.h>
 #include <private/android_filesystem_config.h>
 #include <utils/String8.h>
 #include <selinux/android.h>
 #include <seccomp_policy.h>
 #include <stats_event_list.h>
 #include <processgroup/processgroup.h>
+#include <processgroup/sched_policy.h>
 
 #include "core_jni_helpers.h"
 #include <nativehelper/JNIHelp.h>

From ced57bb7fc8de19387b9974f2bdfdf5abe8d316c Mon Sep 17 00:00:00 2001
From: Suren Baghdasaryan <surenb@google.com>
Date: Thu, 17 Jan 2019 09:47:51 -0800
Subject: [PATCH 2/2] Add libprocessgroup dependency

Because set_sched_policy is moved into libprocessgroup an additional
dependency is required for its users. libframeworksnettestsjni requires
libprocessgroup otherwise com.android.frameworks.tests.net fails with
error:
dlopen failed: library "libprocessgroup.so" not found

Exempt-From-Owner-Approval: janitorial

Bug: 111307099
Test: builds, boots

Merged-In: Ia8bc5b447efa568fd1c822746919fa1496cc42a6
Change-Id: Ia8bc5b447efa568fd1c822746919fa1496cc42a6
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
---
 tests/net/Android.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/net/Android.mk b/tests/net/Android.mk
index f6f35fdadcd17..6850673771660 100644
--- a/tests/net/Android.mk
+++ b/tests/net/Android.mk
@@ -54,6 +54,7 @@ LOCAL_JNI_SHARED_LIBRARIES := \
     libnativehelper \
     libpackagelistparser \
     libpcre2 \
+    libprocessgroup \
     libselinux \
     libui \
     libutils \