devel/android-tools-adb: drop unused files after r448522 and r477244
https://android.googlesource.com/platform/system/core/+/e8b663fec3ac%5E%21/ https://android.googlesource.com/platform/system/core/+/e5dd71a290f6%5E%21/ https://android.googlesource.com/platform/system/core/+/d51c6df1ef98%5E%21/
This commit is contained in:
@@ -63,13 +63,11 @@ SRCS+= chrono_utils.cpp
|
||||
SRCS+= file.cpp
|
||||
SRCS+= logging.cpp
|
||||
SRCS+= parsenetaddress.cpp
|
||||
SRCS+= quick_exit.cpp
|
||||
SRCS+= stringprintf.cpp
|
||||
SRCS+= strings.cpp
|
||||
TEST_SRCS+= file_test.cpp
|
||||
TEST_SRCS+= logging_test.cpp
|
||||
TEST_SRCS+= parsenetaddress_test.cpp
|
||||
TEST_SRCS+= quick_exit_test.cpp
|
||||
TEST_SRCS+= stringprintf_test.cpp
|
||||
TEST_SRCS+= strings_test.cpp
|
||||
TEST_SRCS+= test_main.cpp
|
||||
@@ -90,28 +88,14 @@ SRCS+= socket_local_client_unix.cpp
|
||||
SRCS+= socket_local_server_unix.cpp
|
||||
SRCS+= socket_network_client_unix.cpp
|
||||
SRCS+= ../libcutils/sockets.cpp
|
||||
SRCS+= load_file.cpp
|
||||
SRCS+= threads.cpp
|
||||
# DragonFly, NetBSD, OpenBSD
|
||||
CPPFLAGS.sockets.cpp+= -o ${.TARGET}
|
||||
|
||||
# required by base/file.cpp
|
||||
.PATH: ${.CURDIR}/../liblog
|
||||
SRCS+= config_read.cpp
|
||||
SRCS+= config_write.cpp
|
||||
SRCS+= fake_log_device.cpp
|
||||
SRCS+= fake_writer.cpp
|
||||
SRCS+= logger_lock.cpp
|
||||
SRCS+= logger_name.cpp
|
||||
SRCS+= logger_write.cpp
|
||||
SRCS+= logprint.cpp
|
||||
SRCS+= stderr_write.cpp
|
||||
|
||||
CPPFLAGS+= -DPLATFORM_TOOLS_VERSION="\"${VERSION:U0.0.0}\""
|
||||
CPPFLAGS+= -DADB_HOST=1
|
||||
CPPFLAGS+= -Doff64_t=off_t
|
||||
CPPFLAGS+= -Dlseek64=lseek
|
||||
CPPFLAGS+= -DFAKE_LOG_DEVICE=1
|
||||
CPPFLAGS+= -I${.CURDIR}
|
||||
CPPFLAGS+= -I${.CURDIR}/client
|
||||
CPPFLAGS+= -I${.CURDIR}/../include
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
--- liblog/fake_writer.cpp.orig 2019-07-17 19:54:09 UTC
|
||||
+++ liblog/fake_writer.cpp
|
||||
@@ -33,8 +33,8 @@ static int logFds[(int)LOG_ID_MAX] = {-1, -1, -1, -1,
|
||||
|
||||
struct android_log_transport_write fakeLoggerWrite = {
|
||||
.node = {&fakeLoggerWrite.node, &fakeLoggerWrite.node},
|
||||
- .context.priv = &logFds,
|
||||
.name = "fake",
|
||||
+ .context = { .priv = &logFds }, // GCC
|
||||
.available = NULL,
|
||||
.open = fakeOpen,
|
||||
.close = fakeClose,
|
||||
@@ -1,16 +0,0 @@
|
||||
--- liblog/logger.h.orig 2019-08-13 02:10:58 UTC
|
||||
+++ liblog/logger.h
|
||||
@@ -16,7 +16,13 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
+#ifdef __cplusplus
|
||||
+#include <atomic>
|
||||
+using std::atomic_int;
|
||||
+using std::atomic_uintptr_t;
|
||||
+#else
|
||||
#include <stdatomic.h>
|
||||
+#endif
|
||||
|
||||
#include <cutils/list.h>
|
||||
#include <log/log.h>
|
||||
@@ -1,17 +0,0 @@
|
||||
--- liblog/logger_write.cpp.orig 2019-07-17 19:54:09 UTC
|
||||
+++ liblog/logger_write.cpp
|
||||
@@ -15,12 +15,12 @@
|
||||
*/
|
||||
|
||||
#include <errno.h>
|
||||
-#include <stdatomic.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/time.h>
|
||||
|
||||
-#ifdef __BIONIC__
|
||||
+#if defined(__ANDROID__)
|
||||
+#include <stdatomic.h>
|
||||
#include <android/set_abort_message.h>
|
||||
#endif
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
--- liblog/stderr_write.cpp.orig 2019-07-17 19:54:09 UTC
|
||||
+++ liblog/stderr_write.cpp
|
||||
@@ -56,8 +56,8 @@ struct stderrContext {
|
||||
|
||||
struct android_log_transport_write stderrLoggerWrite = {
|
||||
.node = {&stderrLoggerWrite.node, &stderrLoggerWrite.node},
|
||||
- .context.priv = NULL,
|
||||
.name = "stderr",
|
||||
+ .context = { .priv = NULL }, // GCC
|
||||
.available = stderrAvailable,
|
||||
.open = stderrOpen,
|
||||
.close = stderrClose,
|
||||
Reference in New Issue
Block a user