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

Commit 05dbcd1a authored by Mohammed Althaf T's avatar Mohammed Althaf T 😊
Browse files

Merge branch '2750-master-update_to_130' into 'master' 

Browser: Update to 130.0.6723.67

See merge request !74
parents b86f0556 4ab944b5

Dockerfile

+1 −1
Original line number Diff line number Diff line 
FROM ubuntu:20.04



ENV CHROMIUM_DIR "/srv/chromium"

ENV CHROMIUM_VER "129.0.6668.71"

ENV CHROMIUM_VER "130.0.6723.67"



RUN apt-get update && \

    DEBIAN_FRONTEND=noninteractive \

build.sh

+8 −14
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ if [ ! -d "$chromium_dir" ]; then 
    chromium_dir=$root_dir

fi

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

chromium_code=$(echo "$chromium_version" | tr -d '.' | cut -c5-)

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

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

clean=0

gsync=0
@@ -38,19 +38,8 @@ build() { 
    build_args="$(cat "${root_dir}"/build/browser.gn_args) target_cpu=\"${1}\" "



    apk_arch=${1}

    code=$chromium_code

    if [ $1 '==' "arm" ]; then

        code+=00

    elif [ $1 '==' "arm64" ]; then

        code+=50

    elif [ $1 '==' "x86" ]; then

        code+=10

    elif [ $1 '==' "x64" ]; then

        apk_arch="x86_64"

        code+=60

    fi

    build_args+=' android_default_version_name="'$chromium_version'"'

    build_args+=' android_default_version_code="'$code'"'

    build_args+=' android_default_version_code="'$chromium_code'"'



    if [ $clean -eq 1 ]; then

        if [ -d "out/$1" ]; then
@@ -197,8 +186,13 @@ solutions = [{ 
    "url": "$chromium_url@$chromium_commit_hash",

    "managed": False,

    "name": "src",

    "deps_file": 'DEPS',

    "custom_deps": {},

    "custom_vars": {}

    "custom_vars": {

        "checkout_android_prebuilts_build_tools": True,

        "checkout_telemetry_dependencies": False,

        "checkout_pgo_profiles": True,

    }

}]



target_os = ["android"]

build/.gitignore

+0 −1
Original line number Diff line number Diff line 
cromite/

build/browser.gn_args

+6 −2
Original line number Diff line number Diff line
@@ -2,17 +2,19 @@ android_channel="stable" 
blink_symbol_level=1

build_contextual_search=false

build_with_tflite_lib=false

chrome_pgo_phase=0

chrome_pgo_phase=2

dcheck_always_on=false

dfmify_dev_ui=false

disable_android_lint=true

disable_fieldtrial_testing_config=true

enable_arcore=false

enable_av1_decoder=true

enable_bound_session_credentials=false

enable_cardboard=false

enable_dav1d_decoder=true

enable_hangout_services_extension=false

enable_iterator_debugging=false

enable_log_error_not_reached=true

enable_mdns=false

enable_mse_mpeg2ts_stream_parser=true

enable_nacl=false
@@ -22,17 +24,19 @@ enable_platform_dts_audio=false 
enable_platform_encrypted_dolby_vision=false

enable_platform_hevc=true

enable_precompiled_headers=false

enable_remoting=false

enable_reporting=false

enable_request_header_integrity=false

enable_remoting=false

enable_vr=false

exclude_unwind_tables=false

ffmpeg_branding="Chrome"

generate_linker_map=true

icu_use_data_file=true

is_cfi=false

is_component_build=false

is_debug=false

is_official_build=true

media_use_openh264=false

proprietary_codecs=true

rtc_build_examples=false

safe_browsing_use_unrar=false

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

+2 −2
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

@@ -3406,9 +3406,9 @@

@@ -3430,9 +3430,9 @@

     "expiry_milestone": 135

   },

   {
@@ -168,8 +168,8 @@ diff --git a/gpu/config/gpu_finch_features.h b/gpu/config/gpu_finch_features.h 
 #if BUILDFLAG(IS_ANDROID)

+GPU_EXPORT BASE_DECLARE_FEATURE(kAImageReaderMediaPlayer);

 GPU_EXPORT BASE_DECLARE_FEATURE(kAndroidSurfaceControl);

 GPU_EXPORT BASE_DECLARE_FEATURE(kEnableGpuMemoryBufferImplAHB);

 GPU_EXPORT BASE_DECLARE_FEATURE(kWebViewSurfaceControl);

 GPU_EXPORT BASE_DECLARE_FEATURE(kWebViewSurfaceControlForTV);

diff --git a/gpu/config/gpu_util.cc b/gpu/config/gpu_util.cc

--- a/gpu/config/gpu_util.cc

+++ b/gpu/config/gpu_util.cc