Thorium_Archive/thorium-mirror
1
0
Fork 0
mirror of https://github.com/Alex313031/thorium.git synced 2025-01-09 11:27:32 -03:00
Code Issues Projects Releases Packages Wiki Activity

link fix for arm32 android

Browse source
This commit is contained in:
Alexander Frick 2023-03-13 08:08:20 -05:00
parent 7043a803e8
commit 9c51bc9294
4 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arm/android_ARM32_args.gn
View file

@ -63,7 +63,7 @@ enable_cros_media_app = false
proprietary_codecs = true
ffmpeg_branding = "Chrome"
clang_use_chrome_plugins = true
enable_ffmpeg_video_decoders = true
enable_ffmpeg_video_decoders = false
is_component_ffmpeg = false
use_webaudio_ffmpeg = false
use_webaudio_pffft = true

10
build_android.sh
View file

@ -56,11 +56,12 @@ export NINJA_SUMMARIZE_BUILD=1 &&
./depot_tools/autoninja -C ~/chromium/src/out/thorium chrome_public_apk thorium_shell_apk system_webview_apk -j$@ &&
mv ~/chromium/src/out/thorium/apks/ChromePublic.apk ~/chromium/src/out/thorium/apks/Thorium_Public.apk &&
mv ~/chromium/src/out/thorium/apks/ChromePublic.apk ~/chromium/src/out/thorium/apks/Thorium_Public_arm32.apk &&
cat logos/thorium_logo_ascii_art.txt &&
printf "${GRE}${bold}Build Completed. ${YEL}${bold}You can copy the .apks to your device or use ADB to install.\n" &&
printf "${GRE}${bold}Build Completed. ${YEL}${bold}You can copy the .apk(s) to your device or use ADB to install it.\n" &&
printf "${GRE}${bold}They are located in //chromium/src/out/thorium/apks/\n" &&
tput sgr0
}
case $1 in
@ -72,11 +73,12 @@ export NINJA_SUMMARIZE_BUILD=1 &&
./depot_tools/autoninja -C ~/chromium/src/out/thorium chrome_public_apk thorium_shell_apk -j$@ &&
mv ~/chromium/src/out/thorium/apks/ChromePublic.apk ~/chromium/src/out/thorium/apks/Thorium_Public.apk &&
mv ~/chromium/src/out/thorium/apks/ChromePublic.apk ~/chromium/src/out/thorium/apks/Thorium_Public_arm64.apk &&
cat logos/thorium_logo_ascii_art.txt &&
printf "${GRE}${bold}Build Completed. ${YEL}${bold}You can copy the .apks to your device or use ADB to install.\n" &&
printf "${GRE}${bold}Build Completed. ${YEL}${bold}You can copy the .apk(s) to your device or use ADB to install it.\n" &&
printf "${GRE}${bold}They are located in //chromium/src/out/thorium/apks/\n" &&
tput sgr0 &&
exit 0

10
src/media/media_options.gni
View file

@ -89,7 +89,7 @@ declare_args() {
# Enable browser managed persistent metadata storage for EME persistent
# session and persistent usage record session.
enable_media_drm_storage = is_android || is_castos
enable_media_drm_storage = true
# Enable HLS manifest parser and demuxer.
enable_hls_demuxer = true
@ -97,10 +97,7 @@ declare_args() {
# Enable inclusion of the HEVC/H265 parser and also enable HEVC/H265 decoding
# with hardware acceleration assist. Enabled by default for fuzzer builds,
# ChromeOS builds with protected content support, Windows, Mac, and Android.
enable_hevc_parser_and_hw_decoder =
proprietary_codecs &&
(use_fuzzing_engine || use_chromeos_protected_media || is_win || is_mac ||
is_android || is_linux)
enable_hevc_parser_and_hw_decoder = true
}
# Use another declare_args() to allow dependence on
@ -207,8 +204,7 @@ declare_args() {
declare_args() {
# Enables host verification for CDMs.
# Windows and Mac.
enable_cdm_host_verification =
enable_library_cdms && (is_mac || is_win) && is_chrome_branded
enable_cdm_host_verification = false
# Enable Storage ID which is used by CDMs. This is only available with chrome
# branding, but may be overridden by other embedders.

10
src/third_party/widevine/cdm/widevine.gni vendored
View file

@ -1,4 +1,4 @@
# Copyright 2015 The Chromium Authors
# Copyright 2023 The Chromium Authors and Alex313031
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@ -47,15 +47,14 @@ enable_widevine_cdm_component =
# Enable (Windows) Media Foundation Widevine CDM component.
declare_args() {
enable_media_foundation_widevine_cdm =
is_win && enable_widevine && is_chrome_branded
enable_media_foundation_widevine_cdm = false
}
assert(!enable_media_foundation_widevine_cdm || is_win)
assert(!enable_media_foundation_widevine_cdm || enable_widevine)
declare_args() {
# Widevine CDM is bundled as part of Google Chrome builds.
bundle_widevine_cdm = enable_library_widevine_cdm && is_chrome_branded
bundle_widevine_cdm = false
# Relative root directory to //third_party/widevine/cdm for CDM files.
# Can be overridden if the CDM files are located in other places.
@ -68,8 +67,7 @@ if (target_os == "win" && target_cpu == "arm64") {
# Enable Widevine CDM host verification, which will sign additional binaries
# with Widevine certs and copy signature files as needed.
enable_widevine_cdm_host_verification =
enable_library_widevine_cdm && enable_cdm_host_verification
enable_widevine_cdm_host_verification = false
declare_args() {
# If set, and Widevine CDM host verification signing failed due to no signing