Pull in HAVE_MALLOC_H fix from master to make updated sqlite happy

Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>

2 files changed, 26 insertions, 0 deletions

diff --git a/LOLLIPOP-STABLE-PATCHSET b/LOLLIPOP-STABLE-PATCHSET
index da20dc2..120fd58 100755
--- a/LOLLIPOP-STABLE-PATCHSET
+++ b/LOLLIPOP-STABLE-PATCHSET
@@ -44,6 +44,8 @@ apply --linaro bionic 15515/1
 apply --linaro external/bluetooth/bluedroid 15610/1
 # Fix API check on build hosts with modern glibc versions
 apply system/core 114555/1
+# Make sure HAVE_MALLOC_H has a value to make updated sqlite happy
+cherrypick build 9b44afb4529d743e291d6565d6fbe463cd8c964b
 
 ##################################################
 ################ Temporary fix ###################
diff --git a/functions b/functions
index 6488c6f..61ccfe9 100644
--- a/functions
+++ b/functions
@@ -50,3 +50,27 @@ cherrypick() {
 	fi
 	PATCHES=$((PATCHES+1))
 }
+
+revert() {
+	local PATCH
+	PATCH=false
+	if [ "$1" == "--patch" -o "$1" == "-p" ]; then
+		PATCH=true
+		shift
+	fi
+	cd "$AOSP"/"$1"
+	echo "=== Reverting $2 ==="
+	if $PATCH; then
+		if ! git show $2 |patch -p1 -R; then
+			echo "$2 failed to revert by patching, please fix"
+			exit 1
+		fi
+		git commit -am "Revert $2"
+	else
+		if ! git revert --no-edit "$2"; then
+			echo "$2 failed to revert, please fix"
+			exit 1
+		fi
+	fi
+	PATCHES=$((PATCHES+1))
+}