summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Suren Baghdasaryan <surenb@google.com> 2019-01-19 00:39:13 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2019-01-19 00:39:13 +0000
commite62055462ce457770aa2994a31b783c0e87d1954 (patch)
treed6392cf3242debfb428fdf9358dfcd3445a2e359
parent6d0c7aff5d37ef218c4faa8d28284d3b046d3efd (diff)
parente44332655b0a9f504bb73e1b0da8298fc76c4e02 (diff)
Merge "Add libprocessgroup dependency and fix sched_policy include"
-rw-r--r--core/jni/android_util_Process.cpp2
-rw-r--r--core/jni/com_android_internal_os_Zygote.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android_util_Process.cpp b/core/jni/android_util_Process.cpp
index 798825fbe4a9..26a474cfecba 100644
--- a/core/jni/android_util_Process.cpp
+++ b/core/jni/android_util_Process.cpp
@@ -22,12 +22,12 @@
#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 <meminfo/procmeminfo.h>
#include <meminfo/sysmeminfo.h>
#include <processgroup/processgroup.h>
+#include <processgroup/sched_policy.h>
#include <string>
#include <vector>
diff --git a/core/jni/com_android_internal_os_Zygote.cpp b/core/jni/com_android_internal_os_Zygote.cpp
index 057e02a20057..7aee8338d3c4 100644
--- a/core/jni/com_android_internal_os_Zygote.cpp
+++ b/core/jni/com_android_internal_os_Zygote.cpp
@@ -62,13 +62,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>