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

Commit 62a17f89 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '3499-master-update' into 'master' 

Update browser to v138.0.7204.168

See merge request !94
parents 811676d0 8eb33f17

Dockerfile

deleted100644 → 0
+0 −27
Original line number Diff line number Diff line 
FROM ubuntu:22.04



ENV CHROMIUM_DIR "/srv/chromium"

ENV CHROMIUM_VER "138.0.7204.157"

ENV DEBIAN_FRONTEND=noninteractive



RUN apt-get update && \

    apt-get install -y software-properties-common



RUN dpkg --add-architecture i386



RUN apt-get update && \

    apt-get -f -y install sudo lsb-release cl-base64 bash wget apt-utils ccache jq file \

    python-is-python3 sed tzdata build-essential lib32gcc-9-dev g++-multilib dos2unix wiggle git curl



RUN mkdir ${CHROMIUM_DIR}



RUN curl -s https://raw.githubusercontent.com/chromium/chromium/${CHROMIUM_VER}/build/install-build-deps.py \

       | python - --android --lib32 --no-chromeos-fonts --no-prompt



RUN git config --global user.name "John Doe"

RUN git config --global user.email "johndoe@example.com"

RUN git config --global --add safe.directory "*"



WORKDIR ${CHROMIUM_DIR}



ENTRYPOINT /bin/bash

build.sh

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ root_dir=$(dirname "$(readlink -f "$0")") 
if [ ! -d "$chromium_dir" ]; then

    chromium_dir=$root_dir

fi

chromium_version=$(grep 'ENV CHROMIUM_VER' Dockerfile | awk -F'"' '{print $2}')

chromium_version=$(grep 'chromium_version' versions.txt | awk -F'"' '{print $2}')

chromium_code=$(echo "${chromium_version}" | tr -d '.' | cut -c1-8)

chromium_url=https://github.com/chromium/chromium.git

clean=0

build/cromite_patches/AImageReader-CFI-crash-mitigations.patch

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ diff --git a/base/android/android_image_reader_compat.h b/base/android/android_i 
diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json

--- a/chrome/browser/flag-metadata.json

+++ b/chrome/browser/flag-metadata.json

@@ -3509,6 +3509,10 @@

@@ -3514,6 +3514,10 @@

       "chrome-signin-team@google.com"

     ],

     "expiry_milestone": 138

build/cromite_patches/Add-AllowUserCertificates-flag.patch

+2 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
     public static final String ADAPTIVE_BUTTON_IN_TOP_TOOLBAR_PAGE_SUMMARY =

             "AdaptiveButtonInTopToolbarPageSummary";

     public static final String ALLOW_TAB_CLOSING_UPON_MINIMIZATION =

@@ -679,6 +680,8 @@ public abstract class ChromeFeatureList {

@@ -680,6 +681,8 @@ public abstract class ChromeFeatureList {

     public static final CachedFlag sAndroidWindowPopupLargeScreen =

             newCachedFlag(ANDROID_WINDOW_POPUP_LARGE_SCREEN, false);

     public static final CachedFlag sAppSpecificHistory = newCachedFlag(APP_SPECIFIC_HISTORY, true);
@@ -68,7 +68,7 @@ diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/f 
     public static final CachedFlag sAsyncNotificationManager =

             newCachedFlag(ASYNC_NOTIFICATION_MANAGER, false, true);

     public static final CachedFlag sAsyncNotificationManagerForDownload =

@@ -940,6 +943,7 @@ public abstract class ChromeFeatureList {

@@ -941,6 +944,7 @@ public abstract class ChromeFeatureList {

                     sAccountForSuppressedKeyboardInsets,

                     sAllowTabClosingUponMinimization,

                     sAndroidAppIntegration,

build/cromite_patches/Add-bookmark-import-export-actions.patch

+1 −1
Original line number Diff line number Diff line
@@ -1338,7 +1338,7 @@ diff --git a/chrome/browser/flags/android/chrome_feature_list.cc b/chrome/browse 
diff --git a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

--- a/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

+++ b/chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java

@@ -624,6 +624,7 @@ public abstract class ChromeFeatureList {

@@ -625,6 +625,7 @@ public abstract class ChromeFeatureList {

     public static final String USE_LIBUNWINDSTACK_NATIVE_UNWINDER_ANDROID =

             "UseLibunwindstackNativeUnwinderAndroid";

     public static final String VISITED_URL_RANKING_SERVICE = "VisitedURLRankingService";