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

fix android build

Browse source
This commit is contained in:
Alexander Frick 2023-03-30 15:09:29 -05:00
parent 4a66a63ac8
commit cbd29b9877
4 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arm/android_ARM32_args.gn
View file

@ -37,7 +37,7 @@ enable_iterator_debugging = false
disable_fieldtrial_testing_config = true
enable_reporting = false
enable_remoting = false
enable_resource_allowlist_generation = true
enable_resource_allowlist_generation = false
enable_profiling = false
is_component_build = false
symbol_level = 0

2
arm/android_ARM64_args.gn
View file

@ -37,7 +37,7 @@ enable_iterator_debugging = false
disable_fieldtrial_testing_config = true
enable_reporting = false
enable_remoting = false
enable_resource_allowlist_generation = true
enable_resource_allowlist_generation = false
enable_profiling = false
is_component_build = false
symbol_level = 0

8
build_android.sh
View file

@ -54,8 +54,8 @@ buildARM32 () {
# Build Thorium for ARM32
export NINJA_SUMMARIZE_BUILD=1 &&
./depot_tools/autoninja -C ~/chromium/src/out/thorium chrome_public_apk thorium_shell_apk system_webview_apk -j$@ &&
./depot_tools/autoninja -C ~/chromium/src/out/thorium chrome_public_apk system_webview_apk -j$@ &&
# ADD # thorium_shell_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 &&
@ -70,8 +70,8 @@ esac
# Build Thorium for ARM64
export NINJA_SUMMARIZE_BUILD=1 &&
./depot_tools/autoninja -C ~/chromium/src/out/thorium chrome_public_apk thorium_shell_apk -j$@ &&
# ADD # thorium_shell_apk
./depot_tools/autoninja -C ~/chromium/src/out/thorium chrome_public_apk -j$@ &&
mv ~/chromium/src/out/thorium/apks/ChromePublic.apk ~/chromium/src/out/thorium/apks/Thorium_Public_arm64.apk &&

10
src/content/shell/android/BUILD.gn
View file

@ -1,11 +1,10 @@
# Copyright 2014 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.
import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
import("//third_party/icu/config.gni")
import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
content_shell_manifest =
"$target_gen_dir/content_shell_manifest/AndroidManifest.xml"
@ -140,6 +139,7 @@ android_library("content_shell_apk_java") {
":content_shell_java",
":content_shell_manifest",
"//base:base_java",
"//base:process_launcher_java",
"//build/android:build_java",
"//components/embedder_support/android:view_java",
"//content/public/android:content_java",
@ -173,13 +173,9 @@ android_assets("content_shell_assets") {
disable_compression = true
deps = [
"//content/shell:pak",
"//gin:v8_snapshot_assets",
"//third_party/icu:icu_assets",
]
if (use_v8_context_snapshot) {
deps += [ "//tools/v8_context_snapshot:v8_context_snapshot_assets" ]
} else {
deps += [ "//v8:v8_external_startup_data_assets" ]
}
}
template("content_shell_apk_tmpl") {