diff --git a/core/app_prebuilt_internal.mk b/core/app_prebuilt_internal.mk
index d7fc5e277036bbcad23b79527b2559d5d8be55cf..2671956c7af5bb0bee7356adf2b970c219d3a0dc 100644
--- a/core/app_prebuilt_internal.mk
+++ b/core/app_prebuilt_internal.mk
@@ -245,7 +245,6 @@ ifeq ($(module_run_appcompat),true)
 	$(call appcompat-header, aapt2)
 	$(run-appcompat)
 endif  # module_run_appcompat
-	$(patch-trichrome)
 	$(sign-package)
 	# No need for align-package because sign-package takes care of alignment
 else  # LOCAL_CERTIFICATE == PRESIGNED
diff --git a/core/config.mk b/core/config.mk
index aa1387dd226eccacc03436e2dc91b8740c425717..d60c0b90df99bd2ef4d049c0b91f174e9ddbed06 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -755,8 +755,6 @@ JETIFIER := prebuilts/sdk/tools/jetifier/jetifier-standalone/bin/jetifier-standa
 
 EXTRACT_KERNEL := build/make/tools/extract_kernel.py
 
-PATCH_TRICHROME := build/make/tools/chromium_trichrome_patcher.py
-
 # Path to tools.jar
 HOST_JDK_TOOLS_JAR := $(ANDROID_JAVA8_HOME)/lib/tools.jar
 
diff --git a/core/definitions.mk b/core/definitions.mk
index eb69c9764a9df258566b1480a191e475f002647b..686af53883c3b9e5777b6125408a7a132d9e0861 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -4125,8 +4125,3 @@ define use_soong_sdk_libraries
   $(foreach l,$(1),$(if $(filter $(l),$(SOONG_SDK_VARIANT_MODULES)),\
       $(l).sdk,$(l)))
 endef
-
-# Patch Trichrome to add cert digest at buildtime
-define patch-trichrome
-$(hide) $(PATCH_TRICHROME) $@ $(PRIVATE_CERTIFICATE)
-endef
diff --git a/tools/chromium_trichrome_patcher.py b/tools/chromium_trichrome_patcher.py
deleted file mode 100755
index 5c8964a26aa55b464ce705698cd199815c020802..0000000000000000000000000000000000000000
--- a/tools/chromium_trichrome_patcher.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import subprocess
-import sys
-import zipfile
-
-infilename, sign_key = sys.argv[1:]
-
-def ExtractFingerprint(cert):
-    cmd = ['openssl', 'x509', '-sha256', '-fingerprint', '-noout', '-in', cert]
-    proc = subprocess.run(cmd, stdout=subprocess.PIPE)
-    return proc.stdout.decode('utf-8').split('=')[1].replace(':', '')
-
-def patch_trichrome(infilename, sign_key):
-    orig_certdigest = "c8a2e9bccf597c2fb6dc66bee293fc13f2fc47ec77bc6b2b0d52c11f51192ab8"
-    new_certdigest = ExtractFingerprint(sign_key).lower().rstrip()
-
-    with zipfile.ZipFile(infilename, 'r') as zin, zipfile.ZipFile(infilename + ".patched", 'w') as zout:
-        for info in zin.infolist():
-            data = zin.read(info.filename)
-            if info.filename == 'AndroidManifest.xml':
-                # Make sure we can find the certdigest
-                try:
-                    data.rindex(orig_certdigest.encode('utf-16-le'))
-                except:
-                    pass
-                # Replace it
-                data = data.replace(orig_certdigest.encode('utf-16-le'), new_certdigest.encode('utf-16-le'))
-            zout.writestr(info, data)
-
-    # Delete the original file
-    os.remove(infilename)
-
-    # Rename the output file to the original file name
-    os.rename(infilename + ".patched", infilename)
-
-if "Browser_" in infilename or "BrowserWebView_" in infilename:
-    patch_trichrome(infilename, sign_key)