Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f10f21cd authored by Abhishek Aggarwal's avatar Abhishek Aggarwal
Browse files

[tmp]: It should work

parent 6d8d0ea0

.gitlab-ci.yml

+0 −20
Original line number Diff line number Diff line
@@ -29,16 +29,6 @@ build-docker: 
  tags:

    - build-browser



build-bromite-arm:

  stage: build-arm

  extends: .build-bromite

  script:

    - $CI_PROJECT_DIR/build.sh -c -s -a arm

  artifacts:

    name: "$CI_JOB_NAME"

    paths:

      - apks/arm/*



build-bromite-arm64:

  stage: build-arm64

  extends: .build-bromite
@@ -49,16 +39,6 @@ build-bromite-arm64: 
    paths:

      - apks/arm64/*



build-bromite-x86:

  stage: build-x86

  extends: .build-bromite

  script:

    - $CI_PROJECT_DIR/build.sh -c -s -a x86

  artifacts:

    name: "$CI_JOB_NAME"

    paths:

      - apks/x86/*



build-bromite-x64:

  stage: build-x64

  extends: .build-bromite

build.sh

+5 −8
Original line number Diff line number Diff line
@@ -26,14 +26,13 @@ usage() { 
}



build() {

    apks="TrichromeChrome32 TrichromeLibrary32 TrichromeWebView32 TrichromeChrome6432 TrichromeLibrary6432 TrichromeWebView6432"



    mkdir -p "${root_dir}/apks/${1}"

    gn gen "out/$1" --args="$(cat "${root_dir}"/build/browser.gn_args) target_cpu=\"${1}\" "

    if [ "$1" = "arm" ] || [ "$1" = "x86" ]; then

        ninja -C out/$1 chrome_public_apk system_webview_apk

    elif [ "$1" = "arm64" ] || [ "$1" = "x64" ]; then

        ninja -C out/$1 trichrome_webview_64_32_apk trichrome_chrome_64_32_apk trichrome_library_64_32_apk

    fi

    apks="ChromePublic SystemWebView TrichromeChrome6432 TrichromeLibrary6432 TrichromeWebView6432"

    ninja -C out/$1 trichrome_webview_32_apk trichrome_chrome_32_apk trichrome_library_32_apk \

            trichrome_webview_64_32_apk trichrome_chrome_64_32_apk trichrome_library_64_32_apk



    for apk in $apks; do

        if [ -f "out/${1}/apks/$apk.apk" ]; then

            cp "out/${1}/apks/$apk.apk" "${root_dir}/apks/${1}/$apk.apk"
@@ -110,8 +109,6 @@ cd $chromium_dir/src 
if [ ! -z "$arch" ]; then

    build $arch

else

    build arm

    build arm64

    build x86

    build x64

fi

build/e_patches_list.txt

+1 −0
Original line number Diff line number Diff line
@@ -14,3 +14,4 @@ 
0014-Revert-TM-Add-themed-app-icons.patch

0015-Browser-Use-our-custom-icon-for-browser.patch

0016-TMP-browser-disable-checking-updates.patch

0017-chromium-Add-32-bit-chrome-app-support.patch

build/patches/0017-chromium-Add-32-bit-chrome-app-support.patch

0 → 100644
+40 −0
Original line number Diff line number Diff line 
From d7f7e853af8fd861f33c2a97cab252160e70735c Mon Sep 17 00:00:00 2001

From: TheScarastic <warabhishek@e.email>

Date: Fri, 2 Dec 2022 10:10:43 +0000

Subject: [PATCH] chromium: Add 32 bit chrome app support



---

 chrome/android/BUILD.gn | 17 +++++++++++++++++

 1 file changed, 17 insertions(+)



diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn

index c326e0533129b..f6ba21cfc3d1a 100644

--- a/chrome/android/BUILD.gn

+++ b/chrome/android/BUILD.gn

@@ -3076,6 +3076,23 @@ if (android_64bit_target_cpu) {

     is_64_bit_browser = true

     include_32_bit_webview = false

   }

+

+  monochrome_public_apk_or_module_tmpl("trichrome_chrome_32_apk") {

+    version_code = trichrome_version_code

+    version_name = chrome_version_name

+    apk_name = "TrichromeChrome32"

+    target_type = "android_apk"

+    use_trichrome_library = true

+    static_library_provider = ":trichrome_library_32_apk"

+    if (!is_java_debug) {

+      static_library_synchronized_proguard = trichrome_synchronized_proguard

+      if (trichrome_synchronized_proguard) {

+        resource_ids_provider_dep = "//android_webview:trichrome_webview_apk"

+      }

+    }

+    is_64_bit_browser = false

+    include_64_bit_webview = false

+  }

 }

 

 chrome_public_unit_test_apk_manifest =

-- 

2.25.1