Date: Wed, 8 Jun 2016 15:51:37 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416544 - in head/devel: android-tools-adb-devel android-tools-adb-devel/files android-tools-fastboot android-tools-fastboot-devel android-tools-fastboot-devel/files android-tools-fastb... Message-ID: <201606081551.u58FpbCt091677@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed Jun 8 15:51:36 2016 New Revision: 416544 URL: https://svnweb.freebsd.org/changeset/ports/416544 Log: devel/android-tools-{adb,fastboot}-devel: update to n.p.3.101 Changes: https://android.googlesource.com/platform/system/core/+log/d61bfb9a79e3..35d84096e9a5/adb Changes: https://android.googlesource.com/platform/system/core/+log/d61bfb9a79e3..35d84096e9a5/fastboot Added: head/devel/android-tools-fastboot-devel/files/patch-liblog_logger__write.c (contents, props changed) - copied, changed from r416543, head/devel/android-tools-adb-devel/files/patch-liblog_logger__write.c head/devel/android-tools-fastboot/files/extra-patch-liblog_logd__write.c (contents, props changed) - copied, changed from r416543, head/devel/android-tools-fastboot/files/patch-liblog_logd__write.c Deleted: head/devel/android-tools-fastboot/files/patch-liblog_logd__write.c Modified: head/devel/android-tools-adb-devel/Makefile (contents, props changed) head/devel/android-tools-adb-devel/distinfo (contents, props changed) head/devel/android-tools-adb-devel/files/Makefile (contents, props changed) head/devel/android-tools-fastboot-devel/Makefile (contents, props changed) head/devel/android-tools-fastboot-devel/distinfo (contents, props changed) head/devel/android-tools-fastboot-devel/files/Makefile (contents, props changed) head/devel/android-tools-fastboot-devel/files/usb_freebsd.cpp head/devel/android-tools-fastboot-devel/files/util_freebsd.cpp head/devel/android-tools-fastboot/Makefile (contents, props changed) Modified: head/devel/android-tools-adb-devel/Makefile ============================================================================== --- head/devel/android-tools-adb-devel/Makefile Wed Jun 8 15:09:15 2016 (r416543) +++ head/devel/android-tools-adb-devel/Makefile Wed Jun 8 15:51:36 2016 (r416544) @@ -1,8 +1,8 @@ # $FreeBSD$ -# Hint: git describe --abbrev=12 --match android-n-preview-2 -DISTVERSION= n-preview-2-74 -DISTVERSIONSUFFIX= -gd61bfb9a79e3 +# Hint: git describe --abbrev=12 --match android-n-preview-3 +DISTVERSION= n-preview-3-101 +DISTVERSIONSUFFIX= -g35d84096e9a5 PORTREVISION= 0 PKGNAMESUFFIX= -devel @@ -19,7 +19,7 @@ OPTIONS_DEFINE= TEST_PYTHON TEST_PYTHON_DESC= ${TEST_DESC:S/tests/python &/} TEST_PYTHON_GH_PROJECT= platform_development:development -TEST_PYTHON_GH_TAGNAME= ${GH_MYTAG}-7-gd66a831ffc05:development +TEST_PYTHON_GH_TAGNAME= ${GH_MYTAG}-47-g6925e3e:development TEST_PYTHON_BUILD_DEPENDS=${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock TEST_PYTHON_USES= python:2.7,build Modified: head/devel/android-tools-adb-devel/distinfo ============================================================================== --- head/devel/android-tools-adb-devel/distinfo Wed Jun 8 15:09:15 2016 (r416543) +++ head/devel/android-tools-adb-devel/distinfo Wed Jun 8 15:51:36 2016 (r416544) @@ -1,6 +1,6 @@ -SHA256 (android-platform_system_core-android-n-preview-2-74-gd61bfb9a79e3_GH0.tar.gz) = 2e8d7d19a888805a12cd20b035ca1b6d10c721cc4e2bcb029ebd3d9801ae9664 -SIZE (android-platform_system_core-android-n-preview-2-74-gd61bfb9a79e3_GH0.tar.gz) = 1514832 +SHA256 (android-platform_system_core-android-n-preview-3-101-g35d84096e9a5_GH0.tar.gz) = 0f18ec5fc99aaa1c5c755148759bb5994b366680bda6f23433c9454dbddcab66 +SIZE (android-platform_system_core-android-n-preview-3-101-g35d84096e9a5_GH0.tar.gz) = 1559018 SHA256 (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = dc774f101acd9514baf3e7a0ac610068116f2c093b94987ba59203a39a6439dc SIZE (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = 5948 -SHA256 (android-platform_development-android-n-preview-2-7-gd66a831ffc05_GH0.tar.gz) = d17c1ac1ea597f897b9768104e3dac86922ba3a6edabddfbde3858dc75c7de93 -SIZE (android-platform_development-android-n-preview-2-7-gd66a831ffc05_GH0.tar.gz) = 167896858 +SHA256 (android-platform_development-android-n-preview-3-47-g6925e3e_GH0.tar.gz) = 9956ed223b1f10e70890f51b218f0672dee5818f967d1abf413008c829975d68 +SIZE (android-platform_development-android-n-preview-3-47-g6925e3e_GH0.tar.gz) = 149186317 Modified: head/devel/android-tools-adb-devel/files/Makefile ============================================================================== --- head/devel/android-tools-adb-devel/files/Makefile Wed Jun 8 15:09:15 2016 (r416543) +++ head/devel/android-tools-adb-devel/files/Makefile Wed Jun 8 15:51:36 2016 (r416544) @@ -30,6 +30,7 @@ SRCS+= transport_local.cpp SRCS+= transport_usb.cpp TEST_SRCS+= adb_io_test.cpp +TEST_SRCS+= adb_listeners_test.cpp TEST_SRCS+= adb_utils_test.cpp TEST_SRCS+= fdevent_test.cpp TEST_SRCS+= shell_service_protocol_test.cpp @@ -71,8 +72,11 @@ SRCS+= socket_local_server_unix.c SRCS+= socket_loopback_client_unix.c SRCS+= socket_loopback_server_unix.c SRCS+= socket_network_client_unix.c +SRCS+= ../libcutils/sockets.cpp SRCS+= load_file.c SRCS+= threads.c +# XXX Obsolete after 10.2 or r279980/r280329 +CPPFLAGS.sockets.cpp+= -o ${.TARGET} # required by base/file.cpp .PATH: ${.CURDIR}/../liblog Modified: head/devel/android-tools-fastboot-devel/Makefile ============================================================================== --- head/devel/android-tools-fastboot-devel/Makefile Wed Jun 8 15:09:15 2016 (r416543) +++ head/devel/android-tools-fastboot-devel/Makefile Wed Jun 8 15:51:36 2016 (r416544) @@ -1,14 +1,14 @@ # $FreeBSD$ -# Hint: git describe --abbrev=12 --match android-m-preview -DISTVERSION= m-preview-6425 -DISTVERSIONSUFFIX= -g0fc006685c20 +# Hint: git describe --abbrev=12 --match android-n-preview-3 +DISTVERSION= n-preview-3-101 +DISTVERSIONSUFFIX= -g35d84096e9a5 PORTREVISION= 0 PKGNAMESUFFIX= -devel GH_MYTAG= ${DISTVERSIONPREFIX}${DISTVERSION:C/-[0-9]*$//} -GH_TAGNAME= ${GH_MYTAG}-1197-g21ac023:extras \ - ${GH_MYTAG}-98-gde7b594:libselinux +GH_TAGNAME= ${GH_MYTAG}-45-g86bebf8:extras \ + ${GH_MYTAG}:libselinux CONFLICTS_INSTALL= ${PORTNAME}-[0-9]* Modified: head/devel/android-tools-fastboot-devel/distinfo ============================================================================== --- head/devel/android-tools-fastboot-devel/distinfo Wed Jun 8 15:09:15 2016 (r416543) +++ head/devel/android-tools-fastboot-devel/distinfo Wed Jun 8 15:51:36 2016 (r416544) @@ -1,10 +1,10 @@ SHA256 (fastboot.1?id=706e754) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283 SIZE (fastboot.1?id=706e754) = 5906 -SHA256 (android-platform_system_core-android-m-preview-6425-g0fc006685c20_GH0.tar.gz) = 96659d021fcabbddbf86ea2e834928352fd81a91d49cabea5d03f4c51c85889e -SIZE (android-platform_system_core-android-m-preview-6425-g0fc006685c20_GH0.tar.gz) = 1516347 -SHA256 (jbeich-platform_system_extras-android-m-preview-1197-g21ac023_GH0.tar.gz) = bf6df99267b76e7a3446f3d4d613bbb1493b3ba43ab87aca99f0ade9d2990163 -SIZE (jbeich-platform_system_extras-android-m-preview-1197-g21ac023_GH0.tar.gz) = 76589937 -SHA256 (jbeich-platform_external_libselinux-android-m-preview-98-gde7b594_GH0.tar.gz) = 6ce79ee148103a59ed16e49fd3b9af80e84e65ec4a4ab0a883c14befd6cc29b6 -SIZE (jbeich-platform_external_libselinux-android-m-preview-98-gde7b594_GH0.tar.gz) = 59433 +SHA256 (android-platform_system_core-android-n-preview-3-101-g35d84096e9a5_GH0.tar.gz) = 0f18ec5fc99aaa1c5c755148759bb5994b366680bda6f23433c9454dbddcab66 +SIZE (android-platform_system_core-android-n-preview-3-101-g35d84096e9a5_GH0.tar.gz) = 1559018 +SHA256 (jbeich-platform_system_extras-android-n-preview-3-45-g86bebf8_GH0.tar.gz) = 0b08abf97108f7c2a6c56b728ecf8fbc34ec26f6b00e1ee002828eee9d5b7209 +SIZE (jbeich-platform_system_extras-android-n-preview-3-45-g86bebf8_GH0.tar.gz) = 80661868 +SHA256 (jbeich-platform_external_libselinux-android-n-preview-3_GH0.tar.gz) = 3c90521a2f86064cb0968603972f7d1df45621a7407bfd62d5fdc25cd30a70e2 +SIZE (jbeich-platform_external_libselinux-android-n-preview-3_GH0.tar.gz) = 63015 SHA256 (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = dc774f101acd9514baf3e7a0ac610068116f2c093b94987ba59203a39a6439dc SIZE (mbrubeck-android-completion-3b0fabe_GH0.tar.gz) = 5948 Modified: head/devel/android-tools-fastboot-devel/files/Makefile ============================================================================== --- head/devel/android-tools-fastboot-devel/files/Makefile Wed Jun 8 15:09:15 2016 (r416543) +++ head/devel/android-tools-fastboot-devel/files/Makefile Wed Jun 8 15:51:36 2016 (r416544) @@ -56,9 +56,13 @@ CPPFLAGS.sockets.cpp+= -o ${.TARGET} # X # required by base and libutils .PATH: ${.CURDIR}/../liblog +SRCS+= config_write.c SRCS+= fake_log_device.c -SRCS+= logd_write.c -CPPFLAGS.logd_write.c+= -DFAKE_LOG_DEVICE=1 +SRCS+= fake_writer.c +SRCS+= logger_lock.c +SRCS+= logger_name.c +SRCS+= logger_write.c +CPPFLAGS.config_write.c+= -DFAKE_LOG_DEVICE=1 # required by ext4_utils .PATH: ${.CURDIR}/../libselinux/src @@ -70,6 +74,7 @@ SRCS+= label.c SRCS+= label_android_property.c SRCS+= label_file.c SRCS+= label_support.c +SRCS+= regex.c CPPFLAGS.label_file.c+= -D_WITH_GETLINE # required by fastboot and ext4_utils Copied and modified: head/devel/android-tools-fastboot-devel/files/patch-liblog_logger__write.c (from r416543, head/devel/android-tools-adb-devel/files/patch-liblog_logger__write.c) ============================================================================== Modified: head/devel/android-tools-fastboot-devel/files/usb_freebsd.cpp ============================================================================== --- head/devel/android-tools-fastboot-devel/files/usb_freebsd.cpp Wed Jun 8 15:09:15 2016 (r416543) +++ head/devel/android-tools-fastboot-devel/files/usb_freebsd.cpp Wed Jun 8 15:51:36 2016 (r416544) @@ -44,7 +44,7 @@ struct usb_handle { class LibusbUsbTransport : public Transport { public: - LibusbUsbTransport(std::unique_ptr<usb_handle> handle): + explicit LibusbUsbTransport(std::unique_ptr<usb_handle> handle): h(std::move(handle)) {} ~LibusbUsbTransport() override = default; Modified: head/devel/android-tools-fastboot-devel/files/util_freebsd.cpp ============================================================================== --- head/devel/android-tools-fastboot-devel/files/util_freebsd.cpp Wed Jun 8 15:09:15 2016 (r416543) +++ head/devel/android-tools-fastboot-devel/files/util_freebsd.cpp Wed Jun 8 15:51:36 2016 (r416544) @@ -30,8 +30,10 @@ #include <unistd.h> #include <limits.h> -void -get_my_path(char *path) +std::string +get_my_path() { - getcwd(path, PATH_MAX - 1); + char path[PATH_MAX + 1]; + getcwd(path, sizeof(path) - 1); + return path; } Modified: head/devel/android-tools-fastboot/Makefile ============================================================================== --- head/devel/android-tools-fastboot/Makefile Wed Jun 8 15:09:15 2016 (r416543) +++ head/devel/android-tools-fastboot/Makefile Wed Jun 8 15:51:36 2016 (r416544) @@ -32,6 +32,10 @@ GH_REVISION= f7f765fd62bf # generated by CONFLICTS_INSTALL?= ${PORTNAME}-devel-* +.ifndef EXTRA_PATCHES +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-liblog_logd__write.c +.endif + USES= compiler:c++11-lib pkgconfig uidfix BUILD_WRKSRC= ${WRKSRC}/fastboot INSTALL_WRKSRC= ${BUILD_WRKSRC} Copied and modified: head/devel/android-tools-fastboot/files/extra-patch-liblog_logd__write.c (from r416543, head/devel/android-tools-fastboot/files/patch-liblog_logd__write.c) ==============================================================================
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201606081551.u58FpbCt091677>