android fixes

This commit is contained in:
Alexander Frick 2024-01-26 16:28:16 -06:00
parent 53c51c977e
commit e3871d2896
6 changed files with 59 additions and 9 deletions

View file

@ -1,6 +1,8 @@
google_api_key = ""
google_default_client_id = ""
google_default_client_secret = ""
# Hopefully re-enable
enable_jxl_decoder = false
target_os = "android"
target_cpu = "arm"
v8_target_cpu = "arm"
@ -99,5 +101,6 @@ enable_platform_dts_audio = true
enable_mse_mpeg2ts_stream_parser = true
use_thin_lto = true
thin_lto_enable_optimizations = true
enable_rust = false
chrome_pgo_phase = 0
# pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-android32-main-1696269474-d9cc430a376fd26e31c2c2b532aa055bbc985f6f.profdata"

View file

@ -1,6 +1,8 @@
google_api_key = ""
google_default_client_id = ""
google_default_client_secret = ""
# Hopefully re-enable
enable_jxl_decoder = false
target_os = "android"
target_cpu = "arm64"
v8_target_cpu = "arm64"
@ -99,5 +101,6 @@ enable_platform_dts_audio = true
enable_mse_mpeg2ts_stream_parser = true
use_thin_lto = true
thin_lto_enable_optimizations = true
enable_rust = false
chrome_pgo_phase = 0
# pgo_data_path = "/home/alex/chromium/src/chrome/build/pgo_profiles/chrome-android64-main-1696269474-c48c320c9092df29383f4fdbb89349e9e30169fe.profdata"

View file

@ -2452,13 +2452,19 @@ if (is_win) {
common_optimize_on_cflags += [ "-fno-math-errno" ]
}
config("march-dotprod") {
config("march_crc") {
if (!is_win || is_clang) {
cflags = [ "-march=armv8-a+crc" ]
}
}
config("march_dotprod") {
if (!is_win || is_clang) {
cflags = [ "-march=armv8.2-a+dotprod" ]
}
}
config("march-i8mm") {
config("march_i8mm") {
if (!is_win || is_clang) {
cflags = [ "-march=armv8.2-a+i8mm" ]
}

View file

@ -209,6 +209,39 @@ if (current_cpu == "arm64" || cpu_arch_full == "arm-neon" ||
}
}
if (current_cpu == "arm64") {
source_set("libaom_intrinsics_arm_crc32") {
check_includes = false
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ "//build/config/compiler:march_crc" ]
configs += [ ":libaom_config" ]
sources = aom_av1_encoder_intrin_arm_crc32
}
source_set("libaom_intrinsics_neon_dotprod") {
check_includes = false
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ "//build/config/compiler:march_dotprod" ]
configs += [ ":libaom_config" ]
sources = aom_av1_common_intrin_neon_dotprod
sources += aom_dsp_common_intrin_neon_dotprod
sources += aom_av1_encoder_intrin_neon_dotprod
sources += aom_dsp_encoder_intrin_neon_dotprod
}
source_set("libaom_intrinsics_neon_i8mm") {
check_includes = false
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ "//build/config/compiler:march_i8mm" ]
configs += [ ":libaom_config" ]
sources = aom_av1_common_intrin_neon_i8mm
sources += aom_dsp_common_intrin_neon_i8mm
}
}
static_library("libaom") {
check_includes = false
if (!is_debug && is_win) {
@ -263,6 +296,11 @@ static_library("libaom") {
if (current_cpu == "arm64") {
# This is needed by all arm boards due to aom_arm_cpu_caps()
sources += [ "source/libaom/aom_ports/aarch64_cpudetect.c" ]
deps += [
":libaom_intrinsics_arm_crc32",
":libaom_intrinsics_neon_dotprod",
":libaom_intrinsics_neon_i8mm",
]
}
if (current_cpu == "arm") {
# This is needed by all arm boards due to aom_arm_cpu_caps()

View file

@ -296,7 +296,7 @@ if (current_cpu == "arm64") {
check_includes = false
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ "//build/config/compiler:march-dotprod" ]
configs += [ "//build/config/compiler:march_dotprod" ]
configs += [ ":libvpx_config" ]
if (cpu_arch_full == "arm64") {
sources = libvpx_srcs_arm64_neon_dotprod
@ -311,7 +311,7 @@ if (current_cpu == "arm64") {
check_includes = false
configs -= [ "//build/config/compiler:chromium_code" ]
configs += [ "//build/config/compiler:no_chromium_code" ]
configs += [ "//build/config/compiler:march-i8mm" ]
configs += [ "//build/config/compiler:march_i8mm" ]
configs += [ ":libvpx_config" ]
if (cpu_arch_full == "arm64") {
sources = libvpx_srcs_arm64_neon_i8mm

View file

@ -173,16 +173,16 @@ copyAndroid () {
rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_base/drawable-v26/ic_launcher.xml &&
rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_base/drawable-v26/ic_launcher_round.xml &&
rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_chromium_base/mipmap-mdpi/layered_app_icon_background.png &&
rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_chromium_base/mipmap-mdpi/layered_app_icon.png &&
#rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_chromium_base/mipmap-mdpi/layered_app_icon.png &&
rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_chromium_base/mipmap-xhdpi/layered_app_icon_background.png &&
rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_chromium_base/mipmap-xhdpi/layered_app_icon.png &&
#rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_chromium_base/mipmap-xhdpi/layered_app_icon.png &&
rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon_background.png &&
rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon.png &&
#rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_chromium_base/mipmap-xxxhdpi/layered_app_icon.png &&
rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_chromium_base/mipmap-nodpi/layered_app_icon_foreground.xml &&
rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_chromium_base/mipmap-hdpi/layered_app_icon_background.png &&
rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_chromium_base/mipmap-hdpi/layered_app_icon.png &&
#rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_chromium_base/mipmap-hdpi/layered_app_icon.png &&
rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_chromium_base/mipmap-xxhdpi/layered_app_icon_background.png &&
rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_chromium_base/mipmap-xxhdpi/layered_app_icon.png &&
#rm -v -r -f ${CR_SRC_DIR}/chrome/android/java/res_chromium_base/mipmap-xxhdpi/layered_app_icon.png &&
./infra/fix_libaom.sh &&
printf "\n"
}