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

Commit 96947533 authored by Romain Hunault's avatar Romain Hunault
Browse files

Merge branch 'bromite/master'

parents b1e5ea3a 28d274b7

CHANGELOG.md

+17 −0
Original line number Diff line number Diff line 
# 72.0.3626.87

* update bookmarks view after import



# 72.0.3626.81

* serve empty content for blocked scripts/images (fixes https://github.com/bromite/bromite/issues/238)

* keep support of Jelly Bean (workaround for upstream https://bugs.chromium.org/p/chromium/issues/detail?id=923477)



# 72.0.3626.73



# 72.0.3626.68

* do not ignore save prompt for users without SD card (workaround for upstream wontfix https://bugs.chromium.org/p/chromium/issues/detail?id=916606)

* remove third_party/analytics patch (now fixed upstream in https://chromium.googlesource.com/chromium/src.git/+/64d6a56f094efbab83802c07ad3ddffa014f9903)

* AV1 codec support



# 71.0.3578.132

* add patches from AndroidHardening project (fixes https://github.com/bromite/bromite/issues/226)



# 71.0.3578.123

* disable jumbo builds (fixes https://github.com/bromite/bromite/issues/216 and https://github.com/bromite/bromite/issues/219)

* disable preview fetching

README.md

+2 −1
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ Yes, since version 69. While the desktop version of Chromium has an option to di 
* privacy enhancement patches from [Iridium](https://iridiumbrowser.de/), [Inox patchset](https://github.com/gcarq/inox-patchset), [Brave](https://brave.com/) and [ungoogled-chromium](https://github.com/Eloston/ungoogled-chromium) projects



## Features not related to privacy

* AV1 codec support

* import/export bookmarks

* allow playing videos in background tabs and disable pause on switching tabs

* all codecs included (proprietary, open H.264 etc.)
@@ -136,7 +137,7 @@ The [Bromite main repository](https://github.com/bromite/bromite) contains tags 


Please refer to [official Chromium build documentation](https://www.chromium.org/developers/how-tos/get-the-code) to get started on how to build Chromium; if you can build Chromium for Android, you can build Bromite.



The GN args used to build Bromite are available here: [GN_ARGS](./GN_ARGS).

The GN args used to build Bromite are available here: [GN_ARGS](./build/GN_ARGS).

The patches are to be applied second the order specified in the `patches_list.txt` file (you can use `git am`); the big file `adblock_entries.h` (containing all the AdBlock filters) needs to be copied under `src/net/url_request/`.



# Credits

build/GN_ARGS

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ blink_symbol_level=1 
dcheck_always_on=false

debuggable_apks=false

enable_ac3_eac3_audio_demuxing=true enable_hevc_demuxing=true enable_iterator_debugging=false

enable_av1_decoder=true

enable_hangout_services_extension=false

enable_mdns=false

enable_mse_mpeg2ts_stream_parser=true ffmpeg_branding="Chrome" proprietary_codecs=true

build/filters/adblock_entries.h

+2753 −1671

File changed.

Preview size limit exceeded, changes collapsed.

build/patches/AV1-codec-support.patch

0 → 100644
+260 −0
Original line number Diff line number Diff line 
From: csagan5 <32685696+csagan5@users.noreply.github.com>

Date: Sun, 16 Dec 2018 15:24:19 +0100

Subject: AV1 codec support



libaom build fixes (requires -fPIC)

Report AV1 as playable on Android

---

 media/base/mime_util_internal.cc                                    | 6 +++++-

 third_party/libaom/BUILD.gn                                         | 6 ++++--

 third_party/libaom/libaom_srcs.gni                                  | 5 +++++

 .../source/config/linux/arm-neon-cpu-detect/config/aom_config.asm   | 2 +-

 .../source/config/linux/arm-neon-cpu-detect/config/aom_config.h     | 2 +-

 .../libaom/source/config/linux/arm-neon/config/aom_config.asm       | 2 +-

 third_party/libaom/source/config/linux/arm-neon/config/aom_config.h | 2 +-

 third_party/libaom/source/config/linux/arm/config/aom_config.asm    | 2 +-

 third_party/libaom/source/config/linux/arm/config/aom_config.h      | 2 +-

 third_party/libaom/source/config/linux/arm64/config/aom_config.asm  | 2 +-

 third_party/libaom/source/config/linux/arm64/config/aom_config.h    | 2 +-

 .../libaom/source/config/linux/generic/config/aom_config.asm        | 2 +-

 third_party/libaom/source/config/linux/generic/config/aom_config.h  | 2 +-

 third_party/libaom/source/config/linux/ia32/config/aom_config.asm   | 2 +-

 third_party/libaom/source/config/linux/ia32/config/aom_config.h     | 2 +-

 third_party/libaom/source/config/linux/x64/config/aom_config.asm    | 2 +-

 third_party/libaom/source/config/linux/x64/config/aom_config.h      | 2 +-

 17 files changed, 28 insertions(+), 17 deletions(-)



diff --git a/media/base/mime_util_internal.cc b/media/base/mime_util_internal.cc

--- a/media/base/mime_util_internal.cc

+++ b/media/base/mime_util_internal.cc

@@ -548,9 +548,13 @@ bool MimeUtil::IsCodecSupportedOnAndroid(

     case THEORA:

       return false;

 

-    // AV1 is not supported on Android yet.

+    // AV1 is supported on Android.

     case AV1:

+#if BUILDFLAG(ENABLE_AV1_DECODER)

+      return true;

+#else

       return false;

+#endif

 

     // ----------------------------------------------------------------------

     // The remaining codecs may be supported depending on platform abilities.

diff --git a/third_party/libaom/BUILD.gn b/third_party/libaom/BUILD.gn

--- a/third_party/libaom/BUILD.gn

+++ b/third_party/libaom/BUILD.gn

@@ -74,7 +74,7 @@ if (enable_av1_decoder) {

       sources = aom_dsp_common_asm_sse2

       sources += aom_dsp_common_asm_ssse3

       sources += aom_ports_asm_x86

-      defines = [ "CHROMIUM" ]

+      defines = [ "CHROMIUM", "PIC" ]

       include_dirs = libaom_include_dirs

     }

 

@@ -158,7 +158,7 @@ if (enable_av1_decoder) {

       configs += [ "//build/config/compiler:no_chromium_code" ]

       if (current_cpu == "arm") {

         configs -= [ "//build/config/compiler:compiler_arm_fpu" ]

-        cflags = [ "-mfpu=neon" ]

+        cflags = [ "-mfpu=neon", "-fPIC" ]

       }

       configs += [ ":libaom_config" ]

       sources = aom_av1_common_intrin_neon

@@ -198,6 +198,8 @@ if (enable_av1_decoder) {

     if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" ||

         cpu_arch_full == "arm-neon-cpu-detect") {

       deps += [ ":libaom_intrinsics_neon" ]

+      # will detect CPU

+      sources += aom_ports_arm_sources

     }

     if (is_android) {

       deps += [ "//third_party/android_tools:cpu_features" ]

diff --git a/third_party/libaom/libaom_srcs.gni b/third_party/libaom/libaom_srcs.gni

--- a/third_party/libaom/libaom_srcs.gni

+++ b/third_party/libaom/libaom_srcs.gni

@@ -479,6 +479,11 @@ aom_mem_sources = [

 

 aom_ports_asm_x86 = [ "//third_party/libaom/source/libaom/aom_ports/emms.asm" ]

 

+aom_ports_arm_sources = [

+  "//third_party/libaom/source/libaom/aom_ports/arm_cpudetect.c",

+  "//third_party/libaom/source/libaom/aom_ports/arm.h",

+ ]

+

 aom_rtcd_sources = [

   "//third_party/libaom/source/libaom/aom_dsp/aom_dsp_rtcd_defs.pl",

   "//third_party/libaom/source/libaom/aom_dsp/aom_dsp_rtcd.c",

diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm

--- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm

+++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm

@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1

 CONFIG_NORMAL_TILE_MODE equ 1

 CONFIG_ONE_PASS_SVM equ 0

 CONFIG_OS_SUPPORT equ 1

-CONFIG_PIC equ 0

+CONFIG_PIC equ 1

 CONFIG_RD_DEBUG equ 0

 CONFIG_REDUCED_ENCODER_BORDER equ 0

 CONFIG_RUNTIME_CPU_DETECT equ 1

diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h

--- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h

+++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h

@@ -47,7 +47,7 @@

 #define CONFIG_NORMAL_TILE_MODE 1

 #define CONFIG_ONE_PASS_SVM 0

 #define CONFIG_OS_SUPPORT 1

-#define CONFIG_PIC 0

+#define CONFIG_PIC 1

 #define CONFIG_RD_DEBUG 0

 #define CONFIG_REDUCED_ENCODER_BORDER 0

 #define CONFIG_RUNTIME_CPU_DETECT 1

diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm

--- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm

+++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm

@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1

 CONFIG_NORMAL_TILE_MODE equ 1

 CONFIG_ONE_PASS_SVM equ 0

 CONFIG_OS_SUPPORT equ 1

-CONFIG_PIC equ 0

+CONFIG_PIC equ 1

 CONFIG_RD_DEBUG equ 0

 CONFIG_REDUCED_ENCODER_BORDER equ 0

 CONFIG_RUNTIME_CPU_DETECT equ 0

diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h

--- a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h

+++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h

@@ -47,7 +47,7 @@

 #define CONFIG_NORMAL_TILE_MODE 1

 #define CONFIG_ONE_PASS_SVM 0

 #define CONFIG_OS_SUPPORT 1

-#define CONFIG_PIC 0

+#define CONFIG_PIC 1

 #define CONFIG_RD_DEBUG 0

 #define CONFIG_REDUCED_ENCODER_BORDER 0

 #define CONFIG_RUNTIME_CPU_DETECT 0

diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/third_party/libaom/source/config/linux/arm/config/aom_config.asm

--- a/third_party/libaom/source/config/linux/arm/config/aom_config.asm

+++ b/third_party/libaom/source/config/linux/arm/config/aom_config.asm

@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1

 CONFIG_NORMAL_TILE_MODE equ 1

 CONFIG_ONE_PASS_SVM equ 0

 CONFIG_OS_SUPPORT equ 1

-CONFIG_PIC equ 0

+CONFIG_PIC equ 1

 CONFIG_RD_DEBUG equ 0

 CONFIG_REDUCED_ENCODER_BORDER equ 0

 CONFIG_RUNTIME_CPU_DETECT equ 0

diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/third_party/libaom/source/config/linux/arm/config/aom_config.h

--- a/third_party/libaom/source/config/linux/arm/config/aom_config.h

+++ b/third_party/libaom/source/config/linux/arm/config/aom_config.h

@@ -47,7 +47,7 @@

 #define CONFIG_NORMAL_TILE_MODE 1

 #define CONFIG_ONE_PASS_SVM 0

 #define CONFIG_OS_SUPPORT 1

-#define CONFIG_PIC 0

+#define CONFIG_PIC 1

 #define CONFIG_RD_DEBUG 0

 #define CONFIG_REDUCED_ENCODER_BORDER 0

 #define CONFIG_RUNTIME_CPU_DETECT 0

diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm

--- a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm

+++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm

@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1

 CONFIG_NORMAL_TILE_MODE equ 1

 CONFIG_ONE_PASS_SVM equ 0

 CONFIG_OS_SUPPORT equ 1

-CONFIG_PIC equ 0

+CONFIG_PIC equ 1

 CONFIG_RD_DEBUG equ 0

 CONFIG_REDUCED_ENCODER_BORDER equ 0

 CONFIG_RUNTIME_CPU_DETECT equ 0

diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/third_party/libaom/source/config/linux/arm64/config/aom_config.h

--- a/third_party/libaom/source/config/linux/arm64/config/aom_config.h

+++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.h

@@ -47,7 +47,7 @@

 #define CONFIG_NORMAL_TILE_MODE 1

 #define CONFIG_ONE_PASS_SVM 0

 #define CONFIG_OS_SUPPORT 1

-#define CONFIG_PIC 0

+#define CONFIG_PIC 1

 #define CONFIG_RD_DEBUG 0

 #define CONFIG_REDUCED_ENCODER_BORDER 0

 #define CONFIG_RUNTIME_CPU_DETECT 0

diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.asm b/third_party/libaom/source/config/linux/generic/config/aom_config.asm

--- a/third_party/libaom/source/config/linux/generic/config/aom_config.asm

+++ b/third_party/libaom/source/config/linux/generic/config/aom_config.asm

@@ -45,7 +45,7 @@ CONFIG_MULTITHREAD equ 1

 CONFIG_NORMAL_TILE_MODE equ 1

 CONFIG_ONE_PASS_SVM equ 0

 CONFIG_OS_SUPPORT equ 1

-CONFIG_PIC equ 0

+CONFIG_PIC equ 1

 CONFIG_RD_DEBUG equ 0

 CONFIG_REDUCED_ENCODER_BORDER equ 0

 CONFIG_RUNTIME_CPU_DETECT equ 1

diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h b/third_party/libaom/source/config/linux/generic/config/aom_config.h

--- a/third_party/libaom/source/config/linux/generic/config/aom_config.h

+++ b/third_party/libaom/source/config/linux/generic/config/aom_config.h

@@ -47,7 +47,7 @@

 #define CONFIG_NORMAL_TILE_MODE 1

 #define CONFIG_ONE_PASS_SVM 0

 #define CONFIG_OS_SUPPORT 1

-#define CONFIG_PIC 0

+#define CONFIG_PIC 1

 #define CONFIG_RD_DEBUG 0

 #define CONFIG_REDUCED_ENCODER_BORDER 0

 #define CONFIG_RUNTIME_CPU_DETECT 1

diff --git a/third_party/libaom/source/config/linux/ia32/config/aom_config.asm b/third_party/libaom/source/config/linux/ia32/config/aom_config.asm

--- a/third_party/libaom/source/config/linux/ia32/config/aom_config.asm

+++ b/third_party/libaom/source/config/linux/ia32/config/aom_config.asm

@@ -35,7 +35,7 @@

 %define CONFIG_NORMAL_TILE_MODE 1

 %define CONFIG_ONE_PASS_SVM 0

 %define CONFIG_OS_SUPPORT 1

-%define CONFIG_PIC 0

+%define CONFIG_PIC 1

 %define CONFIG_RD_DEBUG 0

 %define CONFIG_REDUCED_ENCODER_BORDER 0

 %define CONFIG_RUNTIME_CPU_DETECT 1

diff --git a/third_party/libaom/source/config/linux/ia32/config/aom_config.h b/third_party/libaom/source/config/linux/ia32/config/aom_config.h

--- a/third_party/libaom/source/config/linux/ia32/config/aom_config.h

+++ b/third_party/libaom/source/config/linux/ia32/config/aom_config.h

@@ -47,7 +47,7 @@

 #define CONFIG_NORMAL_TILE_MODE 1

 #define CONFIG_ONE_PASS_SVM 0

 #define CONFIG_OS_SUPPORT 1

-#define CONFIG_PIC 0

+#define CONFIG_PIC 1

 #define CONFIG_RD_DEBUG 0

 #define CONFIG_REDUCED_ENCODER_BORDER 0

 #define CONFIG_RUNTIME_CPU_DETECT 1

diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/third_party/libaom/source/config/linux/x64/config/aom_config.asm

--- a/third_party/libaom/source/config/linux/x64/config/aom_config.asm

+++ b/third_party/libaom/source/config/linux/x64/config/aom_config.asm

@@ -35,7 +35,7 @@

 %define CONFIG_NORMAL_TILE_MODE 1

 %define CONFIG_ONE_PASS_SVM 0

 %define CONFIG_OS_SUPPORT 1

-%define CONFIG_PIC 0

+%define CONFIG_PIC 1

 %define CONFIG_RD_DEBUG 0

 %define CONFIG_REDUCED_ENCODER_BORDER 0

 %define CONFIG_RUNTIME_CPU_DETECT 1

diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/third_party/libaom/source/config/linux/x64/config/aom_config.h

--- a/third_party/libaom/source/config/linux/x64/config/aom_config.h

+++ b/third_party/libaom/source/config/linux/x64/config/aom_config.h

@@ -47,7 +47,7 @@

 #define CONFIG_NORMAL_TILE_MODE 1

 #define CONFIG_ONE_PASS_SVM 0

 #define CONFIG_OS_SUPPORT 1

-#define CONFIG_PIC 0

+#define CONFIG_PIC 1

 #define CONFIG_RD_DEBUG 0

 #define CONFIG_REDUCED_ENCODER_BORDER 0

 #define CONFIG_RUNTIME_CPU_DETECT 1

-- 

2.11.0