diff options
| author | 2019-01-24 06:57:55 +0000 | |
|---|---|---|
| committer | 2019-01-24 06:57:55 +0000 | |
| commit | 71e3387254b762e03621ff421059db3566891fdc (patch) | |
| tree | 1bfdf6ede240fe5a8ebf1fd134fd5478dfc9b866 | |
| parent | b3656c7b1b11e10cab70e90dcb6117f70607c891 (diff) | |
| parent | c5e0fdab2c7ff039db26e4d6512bd3d69bdd71d6 (diff) | |
Merge "DO NOT MERGE: Revert "Add libprocessgroup dependency and fix sched_policy include""
| -rw-r--r-- | core/jni/android_util_Process.cpp | 2 | ||||
| -rw-r--r-- | 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 978254175da4..62aa1f38ca30 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 569a89443dca..43e6399e51fc 100644 --- a/core/jni/com_android_internal_os_Zygote.cpp +++ b/core/jni/com_android_internal_os_Zygote.cpp @@ -69,13 +69,13 @@ #include <android-base/unique_fd.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> |