From 19359d1340ea61c46f1f9ed753860177fcb0e2e4 Mon Sep 17 00:00:00 2001 From: Pierre-Hugues Husson Date: Sun, 20 Mar 2022 20:41:33 +0100 Subject: [PATCH] Ignore errors when applying launcher patch, in case of multiple applies --- build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sh b/build.sh index eeb17047..28d0c73d 100644 --- a/build.sh +++ b/build.sh @@ -74,7 +74,7 @@ repo forall -r '.*opengapps.*' -c 'git lfs fetch && git lfs checkout' (cd device/phh/treble; git clean -fdx; if [ -f phh.mk ];then bash generate.sh phh;else bash generate.sh;fi) (cd vendor/foss; git clean -fdx; bash update.sh) if [ "$build_target" == "android-12.0" ] && grep -q lottie packages/apps/Launcher3/Android.bp;then - (cd vendor/partner_gms; git am $originFolder/0001-Fix-SearchLauncher-for-Android-12.1.patch) + (cd vendor/partner_gms; git am $originFolder/0001-Fix-SearchLauncher-for-Android-12.1.patch || true) fi rm -f vendor/gapps/interfaces/wifi_ext/Android.bp