Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -960,8 +960,8 @@
@@ -1242,8 +1242,8 @@
}
} else if (current_cpu == "arm") {
if (is_clang && !is_android && !is_nacl &&
!(is_chromeos_lacros && is_chromeos_device)) {
if (is_clang && !is_android && !is_nacl && !is_chromeos_device) {
- cflags += [ "--target=arm-linux-gnueabihf" ]
- ldflags += [ "--target=arm-linux-gnueabihf" ]
+ cflags += [ "--target=armv7a-linux-android24" ]
+ ldflags += [ "--target=armv7a-linux-android24" ]
}
if (!is_nacl) {
cflags += [
@@ -975,8 +975,8 @@
@@ -1257,8 +1257,8 @@
} else if (current_cpu == "arm64") {
if (is_clang && !is_android && !is_nacl && !is_fuchsia &&
!(is_chromeos_lacros && is_chromeos_device)) {
!is_chromeos_device) {
- cflags += [ "--target=aarch64-linux-gnu" ]
- ldflags += [ "--target=aarch64-linux-gnu" ]
+ cflags += [ "--target=aarch64-linux-android24" ]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
--- a/chrome/browser/ui/startup/infobar_utils.cc
+++ b/chrome/browser/ui/startup/infobar_utils.cc
@@ -154,7 +154,11 @@
infobars::ContentInfoBarManager* infobar_manager =
infobars::ContentInfoBarManager::FromWebContents(web_contents);

+#ifdef __TERMUX__
+ if (0) {
+#else
if (!google_apis::HasAPIKeyConfigured()) {
+#endif
GoogleApiKeysInfoBarDelegate::Create(infobar_manager);
}

15 changes: 0 additions & 15 deletions tur-chromium/chromium-stable/1009-chromium-no-glibc-version.patch

This file was deleted.

11 changes: 10 additions & 1 deletion tur-chromium/chromium-stable/2017-vk-layers-no-android-log.patch
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
[[maybe_unused]] static const char *kForceDefaultCallbackKey = "debug.vvl.forcelayerlog";
--- a/third_party/vulkan-validation-layers/src/layers/vk_layer_config.cpp
+++ b/third_party/vulkan-validation-layers/src/layers/vk_layer_config.cpp
@@ -74,7 +74,7 @@
@@ -52,7 +52,7 @@
#endif

std::string GetEnvironment(const char *variable) {
Expand All @@ -20,6 +20,15 @@
const char *output = getenv(variable);
return output == NULL ? "" : output;
#elif defined(_WIN32)
@@ -90,7 +90,7 @@
}

void SetEnvironment(const char *variable, const char *value) {
-#if !defined(__ANDROID__) && !defined(_WIN32)
+#if (!defined(__ANDROID__) && !defined(_WIN32)) || defined(__TERMUX__)
setenv(variable, value, 1);
#elif defined(_WIN32)
SetEnvironmentVariable(variable, value);
--- a/third_party/vulkan-validation-layers/src/layers/utils/android_ndk_types.h
+++ b/third_party/vulkan-validation-layers/src/layers/utils/android_ndk_types.h
@@ -29,7 +29,9 @@
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- a/pdf/pdfium/pdfium_api_wrappers.cc
+++ b/pdf/pdfium/pdfium_api_wrappers.cc
@@ -147,7 +147,7 @@

// Number of characters, including the NUL.
const size_t expected_size = base::checked_cast<size_t>(buflen_bytes / 2);
- PDFiumAPIStringBufferAdapter adapter(&name, expected_size,
+ PDFiumAPIStringBufferAdapter<std::u16string> adapter(&name, expected_size,
/*check_expected_size=*/true);
unsigned long actual_buflen_bytes = 0; // NOLINT(runtime/int)
bool result =
10 changes: 5 additions & 5 deletions tur-chromium/chromium-stable/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ TERMUX_PKG_HOMEPAGE=https://www.chromium.org/Home
TERMUX_PKG_DESCRIPTION="Chromium web browser"
TERMUX_PKG_LICENSE="BSD 3-Clause"
TERMUX_PKG_MAINTAINER="Chongyun Lee <[email protected]>"
TERMUX_PKG_VERSION=131.0.6778.264
TERMUX_PKG_VERSION=132.0.6834.159
TERMUX_PKG_SRCURL=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$TERMUX_PKG_VERSION.tar.xz
TERMUX_PKG_SHA256=7e02c65865a3095180d60838d2d7a912873d8d4f582c27c2afb9ef876152f2a5
TERMUX_PKG_SHA256=564cc8a258b16d1c6151721a2a72e43ba80642326b33aa79439bba354e686068
TERMUX_PKG_DEPENDS="atk, cups, dbus, fontconfig, gtk3, krb5, libc++, libdrm, libevdev, libxkbcommon, libminizip, libnss, libwayland, libx11, mesa, openssl, pango, pulseaudio, zlib"
# Chromium doesn't support i686 on Linux.
TERMUX_PKG_BLACKLISTED_ARCHES="i686"

SYSTEM_LIBRARIES=" libdrm fontconfig"
# TERMUX_PKG_DEPENDS="libdrm, fontconfig"
SYSTEM_LIBRARIES=" fontconfig"
# TERMUX_PKG_DEPENDS="fontconfig"

termux_step_post_get_source() {
python3 build/linux/unbundle/replace_gn_files.py --system-libraries \
Expand Down Expand Up @@ -158,7 +158,7 @@ chrome_pgo_phase = 0
treat_warnings_as_errors = false
# Use system libraries as little as possible
use_system_freetype = false
use_system_libdrm = true
# use_system_libdrm = true
use_system_libffi = true
use_custom_libcxx = false
use_custom_libcxx_for_host = true
Expand Down
Loading