Disable-safe-browsing.patch
This commit is contained in:
parent
2a81c3cf14
commit
736cca95fa
2 changed files with 2401 additions and 524 deletions
File diff suppressed because it is too large
Load diff
|
@ -16,7 +16,7 @@ diff --git a/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc b/
|
|||
init_params.iRCMode = RC_OFF_MODE;
|
||||
}
|
||||
|
||||
-#if BUILDFLAG(IS_ASH)
|
||||
-#if BUILDFLAG(IS_CHROMEOS_ASH)
|
||||
- init_params.iMultipleThreadIdc = 0;
|
||||
-#else
|
||||
+#if BUILDFLAG(OS_MACOSX)
|
||||
|
@ -30,12 +30,12 @@ diff --git a/third_party/blink/renderer/modules/mediarecorder/h264_encoder.cc b/
|
|||
diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn
|
||||
--- a/third_party/openh264/BUILD.gn
|
||||
+++ b/third_party/openh264/BUILD.gn
|
||||
@@ -132,8 +132,12 @@ if (use_assembler) {
|
||||
@@ -131,8 +131,12 @@ if (use_assembler) {
|
||||
|
||||
source_set("common") {
|
||||
sources = openh264_common_sources
|
||||
- if (is_ash && current_cpu == "arm") {
|
||||
+ if (is_ash || is_android) {
|
||||
- if (is_chromeos_ash && current_cpu == "arm") {
|
||||
+ if (is_chromeos_ash || is_android) {
|
||||
+ if (current_cpu == "arm") {
|
||||
sources += openh264_common_sources_asm_arm
|
||||
+ } else if (current_cpu == "arm64") {
|
||||
|
@ -44,12 +44,12 @@ diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn
|
|||
}
|
||||
include_dirs = openh264_common_include_dirs
|
||||
|
||||
@@ -158,8 +162,12 @@ source_set("common") {
|
||||
@@ -157,8 +161,12 @@ source_set("common") {
|
||||
|
||||
source_set("processing") {
|
||||
sources = openh264_processing_sources
|
||||
- if (is_ash && current_cpu == "arm") {
|
||||
+ if (is_ash || is_android) {
|
||||
- if (is_chromeos_ash && current_cpu == "arm") {
|
||||
+ if (is_chromeos_ash || is_android) {
|
||||
+ if (current_cpu == "arm") {
|
||||
sources += openh264_processing_sources_asm_arm
|
||||
+ } else {
|
||||
|
@ -58,12 +58,12 @@ diff --git a/third_party/openh264/BUILD.gn b/third_party/openh264/BUILD.gn
|
|||
}
|
||||
include_dirs = openh264_processing_include_dirs
|
||||
|
||||
@@ -175,8 +183,12 @@ source_set("processing") {
|
||||
@@ -174,8 +182,12 @@ source_set("processing") {
|
||||
|
||||
source_set("encoder") {
|
||||
sources = openh264_encoder_sources
|
||||
- if (is_ash && current_cpu == "arm") {
|
||||
+ if (is_ash || is_android) {
|
||||
- if (is_chromeos_ash && current_cpu == "arm") {
|
||||
+ if (is_chromeos_ash || is_android) {
|
||||
+ if (current_cpu == "arm") {
|
||||
sources += openh264_encoder_sources_asm_arm
|
||||
+ } else {
|
||||
|
|
Loading…
Add table
Reference in a new issue