Date: Tue, 29 Sep 2015 22:49:34 +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: r398191 - in head/devel/android-tools-adb-devel: . files Message-ID: <201509292249.t8TMnYDs022454@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Tue Sep 29 22:49:33 2015 New Revision: 398191 URL: https://svnweb.freebsd.org/changeset/ports/398191 Log: devel/android-tools-adb-devel: update to m.p.1280 Changes: https://android.googlesource.com/platform/system/core/+log/94c617ccbba4..659f5ade04a5/adb Added: head/devel/android-tools-adb-devel/files/patch-base_include_base_logging.h (contents, props changed) Deleted: head/devel/android-tools-adb-devel/files/patch-base_logging__test.cpp 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-adb-devel/files/usb_libusb.cpp (contents, props changed) Modified: head/devel/android-tools-adb-devel/Makefile ============================================================================== --- head/devel/android-tools-adb-devel/Makefile Tue Sep 29 22:49:17 2015 (r398190) +++ head/devel/android-tools-adb-devel/Makefile Tue Sep 29 22:49:33 2015 (r398191) @@ -1,8 +1,8 @@ # $FreeBSD$ # Hint: git describe --abbrev=12 --match android-m-preview -DISTVERSION= m-preview-1212 -DISTVERSIONSUFFIX= -g94c617ccbba4 +DISTVERSION= m-preview-1280 +DISTVERSIONSUFFIX= -g659f5ade04a5 PORTREVISION= 0 PKGNAMESUFFIX= -devel @@ -23,6 +23,8 @@ ALL_TARGET= all OPTIONS_DEFINE= TEST +TEST_GH_PROJECT=platform_development:development +TEST_GH_TAGNAME=${DISTVERSIONFULL:C/-[0-9].*//}-66-ge4cded6:development TEST_BUILD_DEPENDS=googletest>=1.6.0:${PORTSDIR}/devel/googletest \ ${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock TEST_USES= python:2.7,build @@ -45,9 +47,12 @@ slave-post-patch: pre-install-TEST-on: ${BUILD_WRKSRC}/adb_test # XXX python tests may leave behind running adb server - PATH=${BUILD_WRKSRC}:${PATH} PYTHONPATH=${WRKSRC} \ +# test_adb.py remains in core repository for some reason + ${SETENV} PATH=${BUILD_WRKSRC}:${PATH} \ + PYTHONPATH=${WRKSRC_development}/python-packages \ ${PYTHON_CMD} ${BUILD_WRKSRC}/test_adb.py - PATH=${BUILD_WRKSRC}:${PATH} PYTHONPATH=${WRKSRC} \ - ${PYTHON_CMD} ${BUILD_WRKSRC}/test_device.py + ${SETENV} PATH=${BUILD_WRKSRC}:${PATH} \ + PYTHONPATH=${WRKSRC_development}/python-packages \ + ${PYTHON_CMD} ${WRKSRC_development}/python-packages/adb/test_device.py .include "${MASTERDIR}/Makefile" Modified: head/devel/android-tools-adb-devel/distinfo ============================================================================== --- head/devel/android-tools-adb-devel/distinfo Tue Sep 29 22:49:17 2015 (r398190) +++ head/devel/android-tools-adb-devel/distinfo Tue Sep 29 22:49:33 2015 (r398191) @@ -1,4 +1,6 @@ -SHA256 (android-platform_system_core-android-m-preview-1212-g94c617ccbba4_GH0.tar.gz) = 1ecf8e1ff6eaf133767f80fcf7271a50762a21812166d57abaa4117c6d4ad69c -SIZE (android-platform_system_core-android-m-preview-1212-g94c617ccbba4_GH0.tar.gz) = 1361686 SHA256 (bash_completion.d/adb?id=2b8cfec) = 0d7989596a3e4937834d582eb0ddc88b8186505570772304fe51870d473916a7 SIZE (bash_completion.d/adb?id=2b8cfec) = 5198 +SHA256 (android-platform_system_core-android-m-preview-1280-g659f5ade04a5_GH0.tar.gz) = c81510ca16a001d2399ef5674d07e4099bde9e1542d872bbd69a55078490fb22 +SIZE (android-platform_system_core-android-m-preview-1280-g659f5ade04a5_GH0.tar.gz) = 1361908 +SHA256 (android-platform_development-android-m-preview-66-ge4cded6_GH0.tar.gz) = 5bdb269a4afd5f4b581ec317d3faae7336ea947e9c2ae4c9cf5e07c4c9ad9c1c +SIZE (android-platform_development-android-m-preview-66-ge4cded6_GH0.tar.gz) = 126343719 Modified: head/devel/android-tools-adb-devel/files/Makefile ============================================================================== --- head/devel/android-tools-adb-devel/files/Makefile Tue Sep 29 22:49:17 2015 (r398190) +++ head/devel/android-tools-adb-devel/files/Makefile Tue Sep 29 22:49:33 2015 (r398191) @@ -10,6 +10,7 @@ SRCS+= adb_auth_host.cpp SRCS+= adb_client.cpp SRCS+= adb_io.cpp SRCS+= adb_listeners.cpp +SRCS+= adb_trace.cpp SRCS+= adb_utils.cpp SRCS+= commandline.cpp SRCS+= console.cpp Added: head/devel/android-tools-adb-devel/files/patch-base_include_base_logging.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/android-tools-adb-devel/files/patch-base_include_base_logging.h Tue Sep 29 22:49:33 2015 (r398191) @@ -0,0 +1,11 @@ +--- base/include/base/logging.h.orig 2015-09-29 18:07:07 UTC ++++ base/include/base/logging.h +@@ -25,6 +25,8 @@ + #endif + #endif + ++#include <errno.h> ++ + #include <functional> + #include <memory> + #include <ostream> Modified: head/devel/android-tools-adb-devel/files/usb_libusb.cpp ============================================================================== --- head/devel/android-tools-adb-devel/files/usb_libusb.cpp Tue Sep 29 22:49:17 2015 (r398190) +++ head/devel/android-tools-adb-devel/files/usb_libusb.cpp Tue Sep 29 22:49:33 2015 (r398191) @@ -17,7 +17,7 @@ * limitations under the License. */ -#define TRACE_TAG TRACE_USB +#define TRACE_TAG USB #include "sysdeps.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509292249.t8TMnYDs022454>