From b937a8e008ee29e7095e3f15c781cf42967cd3ca Mon Sep 17 00:00:00 2001 From: althafvly Date: Fri, 26 Sep 2025 11:40:06 +0530 Subject: [PATCH 1/3] Revert "make: Use aosp test key for trichrome" This reverts commit c4c33dccc11f5494a93c2013810eaf4217353f51. --- tools/chromium_trichrome_patcher.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/chromium_trichrome_patcher.py b/tools/chromium_trichrome_patcher.py index 5c8964a26a..bda96b3fa6 100755 --- a/tools/chromium_trichrome_patcher.py +++ b/tools/chromium_trichrome_patcher.py @@ -13,7 +13,7 @@ def ExtractFingerprint(cert): return proc.stdout.decode('utf-8').split('=')[1].replace(':', '') def patch_trichrome(infilename, sign_key): - orig_certdigest = "c8a2e9bccf597c2fb6dc66bee293fc13f2fc47ec77bc6b2b0d52c11f51192ab8" + orig_certdigest = "32a2fc74d731105859e5a85df16d95f102d85b22099b8064c5d8915c61dad1e0" new_certdigest = ExtractFingerprint(sign_key).lower().rstrip() with zipfile.ZipFile(infilename, 'r') as zin, zipfile.ZipFile(infilename + ".patched", 'w') as zout: -- GitLab From e22269c089cc1fb3a79ec82bdc2c3eef5f42a448 Mon Sep 17 00:00:00 2001 From: althafvly Date: Fri, 26 Sep 2025 11:40:07 +0530 Subject: [PATCH 2/3] Revert "make: Catch exception for no certdigest" This reverts commit 29d78725f888c12f1e9d180cf24fca159806ec9f. --- tools/chromium_trichrome_patcher.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tools/chromium_trichrome_patcher.py b/tools/chromium_trichrome_patcher.py index bda96b3fa6..06cdea0448 100755 --- a/tools/chromium_trichrome_patcher.py +++ b/tools/chromium_trichrome_patcher.py @@ -21,10 +21,7 @@ def patch_trichrome(infilename, sign_key): 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 + data.rindex(orig_certdigest.encode('utf-16-le')) # Replace it data = data.replace(orig_certdigest.encode('utf-16-le'), new_certdigest.encode('utf-16-le')) zout.writestr(info, data) -- GitLab From c14b0173432243fd4a755f1d944c9e180f3edaea Mon Sep 17 00:00:00 2001 From: althafvly Date: Fri, 26 Sep 2025 11:40:07 +0530 Subject: [PATCH 3/3] Revert "make: Add Patch Trichrome script" This reverts commit 5d2419fdf26fa66174f12f63d484bbee6364862b. --- core/app_prebuilt_internal.mk | 1 - core/config.mk | 2 -- core/definitions.mk | 5 ---- tools/chromium_trichrome_patcher.py | 36 ----------------------------- 4 files changed, 44 deletions(-) delete mode 100755 tools/chromium_trichrome_patcher.py diff --git a/core/app_prebuilt_internal.mk b/core/app_prebuilt_internal.mk index f6f4673bfc..79639a8301 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 1a6801603a..9f9a564f1e 100644 --- a/core/config.mk +++ b/core/config.mk @@ -605,8 +605,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 773ca9465c..c5fe76b606 100644 --- a/core/definitions.mk +++ b/core/definitions.mk @@ -3454,8 +3454,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 06cdea0448..0000000000 --- a/tools/chromium_trichrome_patcher.py +++ /dev/null @@ -1,36 +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 = "32a2fc74d731105859e5a85df16d95f102d85b22099b8064c5d8915c61dad1e0" - 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 - data.rindex(orig_certdigest.encode('utf-16-le')) - # 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) -- GitLab