diff options
| author | Tom Cherry <tomcherry@google.com> | 2020-04-13 13:09:01 -0700 |
|---|---|---|
| committer | Tom Cherry <tomcherry@google.com> | 2020-04-13 13:09:58 -0700 |
| commit | 842e5af146c561d0d8a4562e33c2b4f1b5532207 (patch) | |
| tree | 3ebc04e342727c3d7565631e5590532205fbce23 | |
| parent | bb24608805cfd71bf7f58817ecd34ff7c2d5c879 (diff) | |
| parent | 7d0c3abcf40152af6529b26a91c04428bf066ade (diff) | |
resolve merge conflicts of 7d0c3abcf40152af6529b26a91c04428bf066ade to rvc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ia19eb2f0061426915f857fdee1cd6112b4a5f9ad
| -rw-r--r-- | core/jni/android_os_SELinux.cpp | 5 | ||||
| -rw-r--r-- | core/jni/android_text_Hyphenator.cpp | 3 | ||||
| -rw-r--r-- | native/android/sharedmem.cpp | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/core/jni/android_os_SELinux.cpp b/core/jni/android_os_SELinux.cpp index 236ee6123cde..3cee8edcd8b0 100644 --- a/core/jni/android_os_SELinux.cpp +++ b/core/jni/android_os_SELinux.cpp @@ -15,6 +15,10 @@ */ #define LOG_TAG "SELinuxJNI" + +#include <errno.h> +#include <fcntl.h> + #include <utils/Log.h> #include <nativehelper/JNIHelp.h> @@ -22,7 +26,6 @@ #include "core_jni_helpers.h" #include "selinux/selinux.h" #include "selinux/android.h" -#include <errno.h> #include <memory> #include <atomic> #include <nativehelper/ScopedLocalRef.h> diff --git a/core/jni/android_text_Hyphenator.cpp b/core/jni/android_text_Hyphenator.cpp index de307737493e..21402b6602eb 100644 --- a/core/jni/android_text_Hyphenator.cpp +++ b/core/jni/android_text_Hyphenator.cpp @@ -14,9 +14,10 @@ * limitations under the License. */ +#include <fcntl.h> #include <sys/mman.h> -#include <sys/types.h> #include <sys/stat.h> +#include <sys/types.h> #include <unistd.h> #include <algorithm> diff --git a/native/android/sharedmem.cpp b/native/android/sharedmem.cpp index 4410bd6fbeed..338b280a8ebe 100644 --- a/native/android/sharedmem.cpp +++ b/native/android/sharedmem.cpp @@ -16,6 +16,9 @@ #include <jni.h> +#include <fcntl.h> +#include <unistd.h> + #include <android/sharedmem.h> #include <android/sharedmem_jni.h> #include <cutils/ashmem.h> @@ -23,7 +26,6 @@ #include <utils/Errors.h> #include <mutex> -#include <unistd.h> static struct { jclass clazz; |