From 8e7624c69c1e23e63129fcd2747619a4879d5879 Mon Sep 17 00:00:00 2001
From: Carmelo Messina <uazo@users.noreply.github.com>
Date: Wed, 19 Jul 2023 14:23:32 +0200
Subject: [PATCH] add android keystore support

---
 .../{build_bromite_dev.yaml => build_cromite.yaml} | 10 ++++++++--
 tools/images/bromite-build/build_args.gni          | 14 ++++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)
 rename .github/workflows/{build_bromite_dev.yaml => build_cromite.yaml} (97%)

diff --git a/.github/workflows/build_bromite_dev.yaml b/.github/workflows/build_cromite.yaml
similarity index 97%
rename from .github/workflows/build_bromite_dev.yaml
rename to .github/workflows/build_cromite.yaml
index 5aa81b7b..5a20033e 100644
--- a/.github/workflows/build_bromite_dev.yaml
+++ b/.github/workflows/build_cromite.yaml
@@ -1,4 +1,4 @@
-name: Build Bromite
+name: Build Cromite
 permissions:
   actions: none
   checks: none
@@ -15,7 +15,7 @@ on:
   workflow_dispatch:
     inputs:
       sha:
-        description: 'uazo/bromite SHA'
+        description: 'uazo/cromite SHA'
         required: true
         default: ''
       target_os:
@@ -178,6 +178,8 @@ jobs:
         # compile in debug mode
         TARGET_ISDEBUG: ${{ github.event.inputs.debug }} 
         TARGET_OS: ${{ github.event.inputs.target_os }}
+        USE_KEYSTORE: true
+        KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
       volumes:
         - /storage/images/android/${{ github.event.inputs.sha }}/${{ github.event.inputs.debug }}/arm64:/home/lg/working_dir/chromium/src/out/bromite
         - /storage/images/android/${{ github.event.inputs.sha }}/${{ github.event.inputs.debug }}/x64:/home/lg/working_dir/chromium/src/out/bromite_x64
@@ -219,6 +221,10 @@ jobs:
           sudo chown lg /run/user/1000/
           sudo chmod g-rxw /run/user/1000/
           sudo chmod o-rxw /run/user/1000/
+
+          # prepare keystore
+          echo "${{ secrets.KEYSTORE }}" > ~/cromite.keystore.asc
+          gpg -d --passphrase "${{ secrets.KEYSTORE_PASSPHRASE }}" --batch ~/cromite.keystore.asc > ~/cromite.keystore
           
       - name: Build Bromite Android arm64
         if: ${{ (github.event.inputs.target_os == 'android' || github.event.inputs.target_os == 'all') && (github.event.inputs.build == 'arm64' || github.event.inputs.build == 'all') }}
diff --git a/tools/images/bromite-build/build_args.gni b/tools/images/bromite-build/build_args.gni
index 79014e11..b91562ca 100644
--- a/tools/images/bromite-build/build_args.gni
+++ b/tools/images/bromite-build/build_args.gni
@@ -5,14 +5,20 @@ declare_args() {
 
 not_needed(["_target_build", "_is_debug_build"])
 
-if(getenv("TARGET_CPU") != "") {
+if (getenv("TARGET_CPU") != "") {
   target_cpu = getenv("TARGET_CPU")
 }
 
 if (target_os == "android") {
   target_os = "android" # fix traffic annotation auditor
   #enable_kythe_annotations = true
-  chrome_public_manifest_package = "org.bromite.bromite.dev"
+  chrome_public_manifest_package = "org.cromite.cromite"
+
+  if (getenv("USE_KEYSTORE") != "") {
+    android_keystore_path = "/home/lg/working_dir/cromite.keystore"
+    android_keystore_name = "cromite"
+    android_keystore_password = getenv("KEYSTORE_PASSWORD")
+  }
 
   _is_debug_build = getenv("TARGET_ISDEBUG")
   if(_is_debug_build == "true") {
@@ -39,11 +45,11 @@ if (target_os == "win") {
   target_cpu = "x64"
   symbol_level = 0
   use_large_pdbs = true
-  
+
   enable_pdf = true
   pdf_is_complete_lib = true
   enable_plugins = true
-  enable_ppapi = false  
+  enable_ppapi = false
 
   is_cfi = false # disable it
   use_cfi_cast = false # disable it