bionic: Update GSI patches for bionic
Signed-off-by: Jackeagle <jackeagle102@gmail.com>
diff --git a/patches/bionic/0002-Actually-restore-pre-P-mutex-behavior.patch b/patches/bionic/0001-Actually-restore-pre-P-mutex-behavior.patch
similarity index 94%
rename from patches/bionic/0002-Actually-restore-pre-P-mutex-behavior.patch
rename to patches/bionic/0001-Actually-restore-pre-P-mutex-behavior.patch
index a85063f..1bc9021 100644
--- a/patches/bionic/0002-Actually-restore-pre-P-mutex-behavior.patch
+++ b/patches/bionic/0001-Actually-restore-pre-P-mutex-behavior.patch
@@ -1,7 +1,7 @@
-From 1117121c17d82e5d65a4c59a8bff60bd79c6d223 Mon Sep 17 00:00:00 2001
+From b3343e687842ad54ca1621f6dcb1d99e6826d65d Mon Sep 17 00:00:00 2001
From: Ethan Chen <intervigil@gmail.com>
Date: Tue, 25 Sep 2018 00:11:05 -0700
-Subject: [PATCH 2/4] Actually restore pre-P mutex behavior
+Subject: [PATCH 1/2] Actually restore pre-P mutex behavior
Apps built against versions < P may not actually expect the EBUSY return
code, and may crash or otherwise misbehave. Check for target SDK
@@ -52,5 +52,5 @@
}
--
-2.17.1
+2.21.0
diff --git a/patches/bionic/0001-Implement-per-process-target-SDK-version-override.patch b/patches/bionic/0001-Implement-per-process-target-SDK-version-override.patch
deleted file mode 100644
index e69de29..0000000
--- a/patches/bionic/0001-Implement-per-process-target-SDK-version-override.patch
+++ /dev/null
diff --git a/patches/bionic/0004-Read-SDK-version-override-from-property.patch b/patches/bionic/0002-Read-SDK-version-override-from-property.patch
similarity index 90%
rename from patches/bionic/0004-Read-SDK-version-override-from-property.patch
rename to patches/bionic/0002-Read-SDK-version-override-from-property.patch
index 6d9ab29..7efdb81 100644
--- a/patches/bionic/0004-Read-SDK-version-override-from-property.patch
+++ b/patches/bionic/0002-Read-SDK-version-override-from-property.patch
@@ -1,7 +1,7 @@
-From bc49de4e6f2bcf1deed8fb6dcd8b65d5e0a30570 Mon Sep 17 00:00:00 2001
+From a26c82a5d2a5a250608b6fe233d6beb3f5939683 Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 3 Jan 2019 17:50:03 +0100
-Subject: [PATCH 4/4] Read SDK version override from property
+Subject: [PATCH 2/2] Read SDK version override from property
Change-Id: I88ca5d0bde15ee4f2b2bd1255e98f9592973dbf9
---
@@ -33,5 +33,5 @@
std::vector<android_namespace_t*> created_namespaces;
--
-2.17.1
+2.21.0
diff --git a/patches/bionic/0003-bionic-Use-legacy-pthread_mutex_init-behavior-on-pre.patch b/patches/bionic/0003-bionic-Use-legacy-pthread_mutex_init-behavior-on-pre.patch
deleted file mode 100644
index e69de29..0000000
--- a/patches/bionic/0003-bionic-Use-legacy-pthread_mutex_init-behavior-on-pre.patch
+++ /dev/null