parent
7c55ae4fac
commit
19b98df63a
|
@ -3,10 +3,9 @@ TERMUX_PKG_DESCRIPTION="Android platform tools"
|
||||||
TERMUX_PKG_LICENSE="Apache-2.0, BSD 2-Clause"
|
TERMUX_PKG_LICENSE="Apache-2.0, BSD 2-Clause"
|
||||||
TERMUX_PKG_LICENSE_FILE="LICENSE, vendor/core/fastboot/LICENSE"
|
TERMUX_PKG_LICENSE_FILE="LICENSE, vendor/core/fastboot/LICENSE"
|
||||||
TERMUX_PKG_MAINTAINER="@termux"
|
TERMUX_PKG_MAINTAINER="@termux"
|
||||||
TERMUX_PKG_VERSION=33.0.3p2
|
TERMUX_PKG_VERSION=34.0.0
|
||||||
TERMUX_PKG_REVISION=1
|
|
||||||
TERMUX_PKG_SRCURL=https://github.com/nmeum/android-tools/releases/download/$TERMUX_PKG_VERSION/android-tools-$TERMUX_PKG_VERSION.tar.xz
|
TERMUX_PKG_SRCURL=https://github.com/nmeum/android-tools/releases/download/$TERMUX_PKG_VERSION/android-tools-$TERMUX_PKG_VERSION.tar.xz
|
||||||
TERMUX_PKG_SHA256=6bf6b52d7389e79fc92b63cc206451ee42fc4f7da769d76922193e98d75f5604
|
TERMUX_PKG_SHA256=f88ec5686937f7fb2f689c3b0506123f2399276a14673164b0f95454a4c7b97a
|
||||||
TERMUX_PKG_AUTO_UPDATE=true
|
TERMUX_PKG_AUTO_UPDATE=true
|
||||||
TERMUX_PKG_DEPENDS="abseil-cpp, brotli, libc++, liblz4, libprotobuf, libusb, pcre2, zlib, zstd"
|
TERMUX_PKG_DEPENDS="abseil-cpp, brotli, libc++, liblz4, libprotobuf, libusb, pcre2, zlib, zstd"
|
||||||
TERMUX_PKG_BUILD_DEPENDS="googletest"
|
TERMUX_PKG_BUILD_DEPENDS="googletest"
|
||||||
|
|
|
@ -17,7 +17,7 @@ index a217ecc..1d8d3b1 100644
|
||||||
selinux/libselinux/src/label_file.c
|
selinux/libselinux/src/label_file.c
|
||||||
- selinux/libselinux/src/regex.c)
|
- selinux/libselinux/src/regex.c)
|
||||||
+ selinux/libselinux/src/regex.c
|
+ selinux/libselinux/src/regex.c
|
||||||
+ selinux/libselinux/src/android/android_platform.c
|
+ selinux/libselinux/src/android/android_seapp.c
|
||||||
+ selinux/libselinux/src/android/android.c
|
+ selinux/libselinux/src/android/android.c
|
||||||
+ selinux/libselinux/src/avc.c
|
+ selinux/libselinux/src/avc.c
|
||||||
+ selinux/libselinux/src/avc_internal.c
|
+ selinux/libselinux/src/avc_internal.c
|
||||||
|
|
|
@ -0,0 +1,18 @@
|
||||||
|
--- a/vendor/core/libcutils/native_handle.cpp
|
||||||
|
+++ b/vendor/core/libcutils/native_handle.cpp
|
||||||
|
@@ -23,13 +23,13 @@
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
// Needs to come after stdlib includes to capture the __BIONIC__ definition
|
||||||
|
-#ifdef __BIONIC__
|
||||||
|
+#if 0
|
||||||
|
#include <android/fdsan.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
|
||||||
|
-#if !defined(__BIONIC__)
|
||||||
|
+#if 1
|
||||||
|
// fdsan stubs when not linked against bionic
|
||||||
|
#define ANDROID_FDSAN_OWNER_TYPE_NATIVE_HANDLE 0
|
||||||
|
|
|
@ -14,12 +14,12 @@ index fe1baa1..21d2627 100644
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -88,7 +90,7 @@ static constexpr uint64_t kMaxFileLength = 256 * static_cast<uint64_t>(1u << 30u
|
@@ -88,7 +90,7 @@ static constexpr uint64_t kMaxFileLength = 256 * static_cast<uint64_t>(1u << 30u
|
||||||
* of the string length into the hash table entry.
|
#endif
|
||||||
*/
|
}
|
||||||
|
|
||||||
-#if defined(__BIONIC__)
|
-#if defined(__BIONIC__)
|
||||||
+#if 0
|
+#if 0
|
||||||
uint64_t GetOwnerTag(const ZipArchive* archive) {
|
static uint64_t GetOwnerTag(const ZipArchive* archive) {
|
||||||
return android_fdsan_create_owner_tag(ANDROID_FDSAN_OWNER_TYPE_ZIPARCHIVE,
|
return android_fdsan_create_owner_tag(ANDROID_FDSAN_OWNER_TYPE_ZIPARCHIVE,
|
||||||
reinterpret_cast<uint64_t>(archive));
|
reinterpret_cast<uint64_t>(archive));
|
||||||
@@ -102,7 +104,7 @@ ZipArchive::ZipArchive(MappedZipFile&& map, bool assume_ownership)
|
@@ -102,7 +104,7 @@ ZipArchive::ZipArchive(MappedZipFile&& map, bool assume_ownership)
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- a/vendor/selinux/libselinux/src/android/android_common.h
|
|
||||||
+++ b/vendor/selinux/libselinux/src/android/android_common.h
|
|
||||||
@@ -20,7 +20,7 @@
|
|
||||||
#include <selinux/android.h>
|
|
||||||
#include <selinux/label.h>
|
|
||||||
#ifndef __ANDROID_VNDK__
|
|
||||||
-#include <private/android_filesystem_config.h>
|
|
||||||
+#include <cutils/android_filesystem_config.h>
|
|
||||||
#endif
|
|
||||||
#include <log/log.h>
|
|
||||||
#include "policy.h"
|
|
|
@ -1,27 +0,0 @@
|
||||||
--- a/vendor/selinux/libselinux/src/android/android_platform.c
|
|
||||||
+++ b/vendor/selinux/libselinux/src/android/android_platform.c
|
|
||||||
@@ -952,6 +952,24 @@
|
|
||||||
return rc;
|
|
||||||
}
|
|
||||||
|
|
||||||
+#if 1
|
|
||||||
+#include <dlfcn.h>
|
|
||||||
+int __system_properties_init(void)
|
|
||||||
+{
|
|
||||||
+ static int initialized = 0;
|
|
||||||
+ static int (*libc_impl)(void) = NULL;
|
|
||||||
+ if (!initialized) {
|
|
||||||
+ void *libc_handle = dlopen("libc.so", RTLD_NOW);
|
|
||||||
+ if (libc_handle != NULL)
|
|
||||||
+ libc_impl = dlsym(libc_handle, "__system_properties_init");
|
|
||||||
+ initialized = 1;
|
|
||||||
+ }
|
|
||||||
+ if (libc_impl != NULL)
|
|
||||||
+ return libc_impl();
|
|
||||||
+ return -1;
|
|
||||||
+}
|
|
||||||
+#endif
|
|
||||||
+
|
|
||||||
int selinux_android_setcon(const char *con)
|
|
||||||
{
|
|
||||||
int ret = setcon(con);
|
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- a/vendor/selinux/libselinux/src/android/android_seapp.c
|
||||||
|
+++ b/vendor/selinux/libselinux/src/android/android_seapp.c
|
||||||
|
@@ -8,7 +8,7 @@
|
||||||
|
#include <string.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
|
||||||
|
-#include <private/android_filesystem_config.h>
|
||||||
|
+#include <cutils/android_filesystem_config.h>
|
||||||
|
#include <selinux/android.h>
|
||||||
|
#include <selinux/context.h>
|
||||||
|
#include <selinux/selinux.h>
|
Loading…
Reference in New Issue