android-tools: update to 31.0.3
This commit is contained in:
parent
cbaf02920b
commit
bad9fd99f8
|
@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=https://developer.android.com/
|
|||
TERMUX_PKG_DESCRIPTION="Android platform tools"
|
||||
TERMUX_PKG_LICENSE="Apache-2.0, MIT"
|
||||
TERMUX_PKG_MAINTAINER="@termux"
|
||||
TERMUX_PKG_VERSION=31.0.2
|
||||
TERMUX_PKG_REVISION=2
|
||||
TERMUX_PKG_VERSION=31.0.3
|
||||
TERMUX_PKG_SRCURL=https://github.com/nmeum/android-tools/releases/download/$TERMUX_PKG_VERSION/android-tools-$TERMUX_PKG_VERSION.tar.xz
|
||||
TERMUX_PKG_SHA256=61b3bf6c240cb0b4d0ccfef696c55986e06657843627df950fdcf6881af0f8d4
|
||||
TERMUX_PKG_SHA256=d7d2d945b6e1a7ba0c7d0b68a6d21ada6914155bf3ca02ff06c9db628ae6b029
|
||||
TERMUX_PKG_AUTO_UPDATE=true
|
||||
TERMUX_PKG_DEPENDS="libc++, libusb, pcre2, googletest, libprotobuf, brotli, zstd, liblz4"
|
||||
|
||||
|
|
|
@ -1,23 +0,0 @@
|
|||
diff --git a/vendor/libbase/logging.cpp b/vendor/libbase/logging.cpp
|
||||
index 168ca42..e3896f3 100644
|
||||
--- a/vendor/libbase/logging.cpp
|
||||
+++ b/vendor/libbase/logging.cpp
|
||||
@@ -61,11 +61,17 @@
|
||||
namespace android {
|
||||
namespace base {
|
||||
|
||||
+#if defined(__linux__)
|
||||
+extern "C" {
|
||||
+extern char* __progname;
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
// BSD-based systems like Android/macOS have getprogname(). Others need us to provide one.
|
||||
#if defined(__linux__) || defined(_WIN32)
|
||||
static const char* getprogname() {
|
||||
#if defined(__linux__)
|
||||
- return program_invocation_short_name;
|
||||
+ return __progname;
|
||||
#elif defined(_WIN32)
|
||||
static bool first = true;
|
||||
static char progname[MAX_PATH] = {};
|
|
@ -11,35 +11,3 @@ index a0153f8..8863f29 100644
|
|||
#ifdef __ANDROID__
|
||||
#include "logd_writer.h"
|
||||
#include "pmsg_writer.h"
|
||||
@@ -108,31 +110,6 @@ void __android_log_close() {
|
||||
#endif
|
||||
}
|
||||
|
||||
-#if defined(__linux__) || defined(_WIN32)
|
||||
-static const char* getprogname() {
|
||||
-#if defined(__linux__)
|
||||
- return program_invocation_short_name;
|
||||
-#elif defined(_WIN32)
|
||||
- static bool first = true;
|
||||
- static char progname[MAX_PATH] = {};
|
||||
-
|
||||
- if (first) {
|
||||
- char path[PATH_MAX + 1];
|
||||
- DWORD result = GetModuleFileName(nullptr, path, sizeof(path) - 1);
|
||||
- if (result == 0 || result == sizeof(path) - 1) return "";
|
||||
- path[PATH_MAX - 1] = 0;
|
||||
-
|
||||
- char* path_basename = basename(path);
|
||||
-
|
||||
- snprintf(progname, sizeof(progname), "%s", path_basename);
|
||||
- first = false;
|
||||
- }
|
||||
-
|
||||
- return progname;
|
||||
-#endif
|
||||
-}
|
||||
-#endif
|
||||
-
|
||||
// It's possible for logging to happen during static initialization before our globals are
|
||||
// initialized, so we place this std::string in a function such that it is initialized on the first
|
||||
// call. We use a pointer to avoid exit time destructors.
|
||||
|
|
Loading…
Reference in New Issue