From 7a220c7719790f3e7b21431d327255ef5d55a5ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
Date: Tue, 12 Feb 2019 23:36:09 +0100
Subject: [PATCH] Upgrade to android-9.0.0_r33

---
 CMakeLists.txt                                     |  2 +-
 ...use-the-internal-glibc-header-sys-cdefs.h.patch | 14 +++++++-------
 vendor/core                                        |  2 +-
 vendor/e2fsprogs                                   |  2 +-
 vendor/extras                                      |  2 +-
 vendor/f2fs-tools                                  |  2 +-
 vendor/selinux                                     |  2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cd27f14..8a3aac0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ set(ANDROID_MKE2FS_NAME "mke2fs.android")
 
 # Version of android-tools and the version of boringssl being used.
 # See: https://android.googlesource.com/platform/external/boringssl/+/android-${ANDROID_VERSION}/BORINGSSL_REVISION
-set(ANDROID_VERSION 9.0.0_r3)
+set(ANDROID_VERSION 9.0.0_r33)
 set(BORINGSSL_VERSION 45210dd4e21ace9d28cb76b3f83303fcdd2efcce)
 
 # The CMakeLists.txt in the vendor subdirectory is responsible for
diff --git a/patches/core/0001-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch b/patches/core/0001-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch
index 0e2ceb0..e1116cd 100644
--- a/patches/core/0001-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch
+++ b/patches/core/0001-Don-t-use-the-internal-glibc-header-sys-cdefs.h.patch
@@ -1,6 +1,6 @@
-From c5f7f3fa9d19e16850d0e1fd67c2415d0ac5c9ff Mon Sep 17 00:00:00 2001
+From 3a5363e0b4fd7ed20225d8eda77d35e0073c02b0 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?S=C3=B6ren=20Tempel?= <soeren+git@soeren-tempel.net>
-Date: Thu, 13 Sep 2018 23:16:04 +0200
+Date: Tue, 12 Feb 2019 23:38:46 +0100
 Subject: [PATCH] Don't use the internal glibc header sys/cdefs.h
 
 This patch was created using sed(1) and ag(1) with the following script:
@@ -1059,7 +1059,7 @@ index 72e3f4a2b..64d060c6a 100644
  
  #endif /* _LIBLMKD_UTILS_H_ */
 diff --git a/lmkd/include/lmkd.h b/lmkd/include/lmkd.h
-index fe6364d82..85e663703 100644
+index e8f51da77..f44ff4f85 100644
 --- a/lmkd/include/lmkd.h
 +++ b/lmkd/include/lmkd.h
 @@ -18,10 +18,11 @@
@@ -1076,8 +1076,8 @@ index fe6364d82..85e663703 100644
  
  /*
   * Supported LMKD commands
-@@ -142,6 +143,8 @@ inline size_t lmkd_pack_set_procremove(LMKD_CTRL_PACKET packet,
-     return 2 * sizeof(int);
+@@ -152,6 +153,8 @@ inline size_t lmkd_pack_set_procpurge(LMKD_CTRL_PACKET packet) {
+     return sizeof(int);
  }
  
 -__END_DECLS
@@ -1087,7 +1087,7 @@ index fe6364d82..85e663703 100644
  
  #endif /* _LMKD_H_ */
 diff --git a/lmkd/statslog.h b/lmkd/statslog.h
-index edebb195b..4a43d99e9 100644
+index 84584805d..06631524b 100644
 --- a/lmkd/statslog.h
 +++ b/lmkd/statslog.h
 @@ -20,11 +20,12 @@
@@ -1105,7 +1105,7 @@ index edebb195b..4a43d99e9 100644
  
  /*
   * These are defined in
-@@ -86,6 +87,8 @@ stats_write_lmk_kill_occurred(android_log_context ctx, int32_t code, int32_t uid
+@@ -89,6 +90,8 @@ stats_write_lmk_kill_occurred(android_log_context ctx, int32_t code, int32_t uid
                                int64_t pgmajfault, int64_t rss_in_bytes, int64_t cache_in_bytes,
                                int64_t swap_in_bytes);
  
diff --git a/vendor/core b/vendor/core
index 0fac901..cddcc0d 160000
--- a/vendor/core
+++ b/vendor/core
@@ -1 +1 @@
-Subproject commit 0fac9018f2388f25f5a5778663a14712e75a9903
+Subproject commit cddcc0d9cf7cbba53e54d67455737a3900ae5d9f
diff --git a/vendor/e2fsprogs b/vendor/e2fsprogs
index fecf0a2..425d1b4 160000
--- a/vendor/e2fsprogs
+++ b/vendor/e2fsprogs
@@ -1 +1 @@
-Subproject commit fecf0a211618bbed183ebf58d5bf489105bed72c
+Subproject commit 425d1b42eaeb44558ced57fc50dfb22187d01d05
diff --git a/vendor/extras b/vendor/extras
index a4c6bbd..9ec7ba8 160000
--- a/vendor/extras
+++ b/vendor/extras
@@ -1 +1 @@
-Subproject commit a4c6bbd8cbf27b6b33aed46eb163a58299d094b5
+Subproject commit 9ec7ba8443caa905c2ebdf6eadd5e6148a348d37
diff --git a/vendor/f2fs-tools b/vendor/f2fs-tools
index dbce694..eeedf7c 160000
--- a/vendor/f2fs-tools
+++ b/vendor/f2fs-tools
@@ -1 +1 @@
-Subproject commit dbce6944f18836258a5005600b6fe140e488fdaa
+Subproject commit eeedf7c7d04c223ea9e27674fd3809b5506ca5f4
diff --git a/vendor/selinux b/vendor/selinux
index 0d8f825..ea4e518 160000
--- a/vendor/selinux
+++ b/vendor/selinux
@@ -1 +1 @@
-Subproject commit 0d8f825909d3e600facbf23be4758877f98c2602
+Subproject commit ea4e5184d243c137da4827e6f83a80014dd86c4b