diff options
Diffstat (limited to 'devel/android-tools-fastboot-devel/files')
3 files changed, 27 insertions, 10 deletions
diff --git a/devel/android-tools-fastboot-devel/files/Makefile b/devel/android-tools-fastboot-devel/files/Makefile index ecfacc04a503..6aea6bb27ec3 100644 --- a/devel/android-tools-fastboot-devel/files/Makefile +++ b/devel/android-tools-fastboot-devel/files/Makefile @@ -49,6 +49,7 @@ SRCS+= wipe.c # required by fastboot .PATH: ${.CURDIR}/../libcutils +SRCS+= android_get_control_file.cpp SRCS+= ../libcutils/sockets.cpp SRCS+= socket_inaddr_any_server_unix.c SRCS+= socket_network_client_unix.c @@ -57,13 +58,17 @@ CPPFLAGS.sockets.cpp+= -o ${.TARGET} # XXX pre-r279980 # required by base and libutils .PATH: ${.CURDIR}/../liblog +SRCS+= config_read.c SRCS+= config_write.c SRCS+= fake_log_device.c SRCS+= fake_writer.c +SRCS+= local_logger.c SRCS+= logger_lock.c SRCS+= logger_name.c SRCS+= logger_write.c -CPPFLAGS.config_write.c+= -DFAKE_LOG_DEVICE=1 +SRCS+= logprint.c +SRCS+= stderr_write.c +SRCS+= test_utils.cpp # required by ext4_utils .PATH: ${.CURDIR}/../libselinux/src @@ -85,7 +90,7 @@ SRCS+= output_file.c SRCS+= sparse.c SRCS+= sparse_crc32.c SRCS+= sparse_err.c -SRCS+= sparse_read.c +SRCS+= sparse_read.cpp # required by libziparchive .PATH: ${.CURDIR}/../libutils @@ -97,18 +102,19 @@ SRCS+= zip_archive.cc REVISION?= $$(${GIT} rev-parse --short=12 HEAD 2>/dev/null || echo unknown) -CPPFLAGS+= -DFASTBOOT_REVISION="\"${REVISION}-android\"" +CPPFLAGS+= -DFASTBOOT_VERSION="\"0.0.0-${REVISION}-android\"" CPPFLAGS+= -Doff64_t=off_t CPPFLAGS+= -Dftruncate64=ftruncate CPPFLAGS+= -Dlseek64=lseek CPPFLAGS+= -Dmmap64=mmap CPPFLAGS+= -Dpread64=pread +CPPFLAGS+= -DFAKE_LOG_DEVICE=1 CPPFLAGS+= -I${.CURDIR} CPPFLAGS+= -I${.CURDIR}/../include CPPFLAGS+= -I${.CURDIR}/../adb CPPFLAGS+= -I${.CURDIR}/../mkbootimg CPPFLAGS+= -I${.CURDIR}/../base/include -CPPFLAGS+= -I${.CURDIR}/../ext4_utils +CPPFLAGS+= -I${.CURDIR}/../ext4_utils/include CPPFLAGS+= -I${.CURDIR}/../f2fs_utils CPPFLAGS+= -I${.CURDIR}/../libselinux/include CPPFLAGS+= -I${.CURDIR}/../libsparse/include diff --git a/devel/android-tools-fastboot-devel/files/patch-base_file.cpp b/devel/android-tools-fastboot-devel/files/patch-base_file.cpp index 199da0b95aca..a0406b97b605 100644 --- a/devel/android-tools-fastboot-devel/files/patch-base_file.cpp +++ b/devel/android-tools-fastboot-devel/files/patch-base_file.cpp @@ -1,16 +1,17 @@ ---- base/file.cpp.orig 2016-09-28 18:07:09 UTC +--- base/file.cpp.orig 2017-06-20 10:50:27 UTC +++ base/file.cpp -@@ -18,6 +18,9 @@ - +@@ -19,6 +19,10 @@ #include <errno.h> #include <fcntl.h> + #include <libgen.h> +#include <limits.h> // PATH_MAX +#include <stdio.h> // BUFSIZ ++#include <stdlib.h> // realpath +#include <string.h> // strerror #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> -@@ -34,6 +37,9 @@ +@@ -36,6 +39,9 @@ #if defined(__APPLE__) #include <mach-o/dyld.h> #endif @@ -19,8 +20,8 @@ +#endif #if defined(_WIN32) #include <windows.h> - #endif -@@ -231,6 +237,17 @@ std::string GetExecutablePath() { + #define O_CLOEXEC O_NOINHERIT +@@ -251,6 +257,17 @@ std::string GetExecutablePath() { if (result == 0 || result == sizeof(path) - 1) return ""; path[PATH_MAX - 1] = 0; return path; diff --git a/devel/android-tools-fastboot-devel/files/patch-libsparse_sparse__read.cpp b/devel/android-tools-fastboot-devel/files/patch-libsparse_sparse__read.cpp new file mode 100644 index 000000000000..30753c5b96cd --- /dev/null +++ b/devel/android-tools-fastboot-devel/files/patch-libsparse_sparse__read.cpp @@ -0,0 +1,10 @@ +--- libsparse/sparse_read.cpp.orig 2017-06-20 10:50:27 UTC ++++ libsparse/sparse_read.cpp +@@ -26,6 +26,7 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string> ++#include <string.h> // memset + #include <unistd.h> + + #include <sparse/sparse.h> |