sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 09:49:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

devel/android-tools-{adb,fastboot}: update to 7.1.0.r4

Browse source 
Changes:	https://android.googlesource.com/platform/system/core/+log/android-7.0.0_r1..android-7.1.0_r4/adb
Changes:	https://android.googlesource.com/platform/system/core/+log/android-7.0.0_r1..android-7.1.0_r4/fastboot
This commit is contained in:
Jan Beich 2016-10-29 05:14:42 +00:00
parent ce8dcf8c75
commit 305c06c3e6
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=424893
7 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
devel/android-tools-adb-devel/Makefile
View file

@ -15,11 +15,8 @@ EXTRA_PATCHES= ${.CURDIR}/files/patch-*
GH_MYTAG= ${DISTVERSIONPREFIX}${DISTVERSION:C/-[0-9]*$//} GH_MYTAG= ${DISTVERSIONPREFIX}${DISTVERSION:C/-[0-9]*$//}
CPPFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528
OPTIONS_DEFINE= TEST_PYTHON OPTIONS_DEFINE= TEST_PYTHON
TEST_BUILD_DEPENDS= googlemock>=1.6.0:devel/googlemock
TEST_BROKEN= logging.* tests always fail after 4e5fd111d84d TEST_BROKEN= logging.* tests always fail after 4e5fd111d84d
TEST_PYTHON_DESC= ${TEST_DESC:S/tests/python &/} TEST_PYTHON_DESC= ${TEST_DESC:S/tests/python &/}

10
devel/android-tools-adb/Makefile
View file

@ -2,8 +2,8 @@
PORTNAME= android-tools-adb PORTNAME= android-tools-adb
DISTVERSIONPREFIX= android- DISTVERSIONPREFIX= android-
DISTVERSION?= 7.0.0_r1 DISTVERSION?= 7.1.0_r4
PORTREVISION?= 1 PORTREVISION?= 0
CATEGORIES= devel CATEGORIES= devel
.ifndef EXTRA_PATCHES .ifndef EXTRA_PATCHES
PATCH_SITES= https://github.com/android/platform_system_core/commit/ PATCH_SITES= https://github.com/android/platform_system_core/commit/
@ -23,7 +23,7 @@ GH_PROJECT= platform_system_core
.ifdef DISTVERSIONSUFFIX .ifdef DISTVERSIONSUFFIX
GH_REVISION= ${DISTVERSIONSUFFIX:S/-g//} # snapshot GH_REVISION= ${DISTVERSIONSUFFIX:S/-g//} # snapshot
.else .else
GH_REVISION= 88f64719d756 # generated by: make update-revision GH_REVISION= 75a38b87f304 # generated by: make update-revision
.endif .endif
CONFLICTS_INSTALL?= ${PORTNAME}-devel-* CONFLICTS_INSTALL?= ${PORTNAME}-devel-*
@ -37,6 +37,7 @@ USES= compiler:c++11-lib pkgconfig ssl uidfix
BUILD_WRKSRC= ${WRKSRC}/adb BUILD_WRKSRC= ${WRKSRC}/adb
INSTALL_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC}
TEST_WRKSRC= ${BUILD_WRKSRC} TEST_WRKSRC= ${BUILD_WRKSRC}
CPPFLAGS+= -D_GLIBCXX_USE_C99 # XXX ports/193528
MAKEFILE= ${FILESDIR}/Makefile MAKEFILE= ${FILESDIR}/Makefile
MAKE_ENV= BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \ MAKE_ENV= BINDIR="${PREFIX}/bin" EXTRADIR="${FILESDIR}" \
FILESDIR="${DOCSDIR}" REVISION="${GH_REVISION}" FILESDIR="${DOCSDIR}" REVISION="${GH_REVISION}"
@ -61,7 +62,8 @@ BASH_VARS= LICENSE+=MIT LICENSE_COMB=multi
DOCS_MAKE_ARGS_OFF= FILES="" FILESDIR="" DOCS_MAKE_ARGS_OFF= FILES="" FILESDIR=""
TEST_BUILD_DEPENDS+= googletest>=1.6.0:devel/googletest TEST_BUILD_DEPENDS+= googlemock>=1.6.0:devel/googlemock \
googletest>=1.6.0:devel/googletest
TEST_ALL_TARGET= adb_test TEST_ALL_TARGET= adb_test
pre-install-TEST-on: do-test pre-install-TEST-on: do-test

6
devel/android-tools-adb/distinfo
View file

@ -1,6 +1,6 @@
TIMESTAMP = 1472009581 TIMESTAMP = 1477685972
SHA256 (android-platform_system_core-android-7.0.0_r1_GH0.tar.gz) = faa44f626dfab9e604f509cc541a8e491e7e46a9de42df3a9c1e24c36fd9f8c4 SHA256 (android-platform_system_core-android-7.1.0_r4_GH0.tar.gz) = 07f61b77c07e588473cac43daf2a36ef213440aa144f1dc0af214f5c7b0529ef
SIZE (android-platform_system_core-android-7.0.0_r1_GH0.tar.gz) = 1570346 SIZE (android-platform_system_core-android-7.1.0_r4_GH0.tar.gz) = 1588982
SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c
SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967 SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967
SHA256 (b4cff495a1f9.patch) = cfb45f82866c7b46bdb9aa62aa0f856c243c13083f37e93b07c4491ad2b7db50 SHA256 (b4cff495a1f9.patch) = cfb45f82866c7b46bdb9aa62aa0f856c243c13083f37e93b07c4491ad2b7db50

8
devel/android-tools-adb/files/Makefile
View file

@ -15,6 +15,7 @@ SRCS+= adb_io.cpp
SRCS+= adb_listeners.cpp SRCS+= adb_listeners.cpp
SRCS+= adb_trace.cpp SRCS+= adb_trace.cpp
SRCS+= adb_utils.cpp SRCS+= adb_utils.cpp
SRCS+= bugreport.cpp
SRCS+= commandline.cpp SRCS+= commandline.cpp
SRCS+= console.cpp SRCS+= console.cpp
SRCS+= diagnose_usb.cpp SRCS+= diagnose_usb.cpp
@ -31,6 +32,7 @@ SRCS+= transport_usb.cpp
TEST_SRCS+= adb_io_test.cpp TEST_SRCS+= adb_io_test.cpp
TEST_SRCS+= adb_utils_test.cpp TEST_SRCS+= adb_utils_test.cpp
TEST_SRCS+= bugreport_test.cpp
TEST_SRCS+= fdevent_test.cpp TEST_SRCS+= fdevent_test.cpp
TEST_SRCS+= shell_service_protocol_test.cpp TEST_SRCS+= shell_service_protocol_test.cpp
TEST_SRCS+= socket_test.cpp TEST_SRCS+= socket_test.cpp
@ -40,6 +42,9 @@ TEST_SRCS+= transport_test.cpp
.PATH: ${.CURDIR}/client .PATH: ${.CURDIR}/client
SRCS+= main.cpp SRCS+= main.cpp
.PATH: ${.CURDIR}/sysdeps
TEST_SRCS+= stat_test.cpp
.PATH: ${EXTRADIR} .PATH: ${EXTRADIR}
SRCS+= get_my_path_freebsd.cpp SRCS+= get_my_path_freebsd.cpp
SRCS+= usb_libusb.cpp SRCS+= usb_libusb.cpp
@ -104,6 +109,7 @@ CXXFLAGS+= ${CPPFLAGS}
.endif .endif
TEST_CPPFLAGS+= $$(${GTEST_CONFIG} --cppflags) TEST_CPPFLAGS+= $$(${GTEST_CONFIG} --cppflags)
TEST_CPPFLAGS+= $$(${GMOCK_CONFIG} --cppflags)
.for f in ${TEST_SRCS} .for f in ${TEST_SRCS}
CPPFLAGS.${f}+= ${TEST_CPPFLAGS} CPPFLAGS.${f}+= ${TEST_CPPFLAGS}
.endfor .endfor
@ -113,12 +119,14 @@ LDADD+= $$(${PKG_CONFIG} libusb-1.0 --libs 2>/dev/null || echo -lusb)
LDADD+= -lz \-lpthread LDADD+= -lz \-lpthread
DPADD+= ${LIBCRYPTO} ${LIBPTHREAD} ${LIBUSB} ${LIBZ} DPADD+= ${LIBCRYPTO} ${LIBPTHREAD} ${LIBUSB} ${LIBZ}
TEST_LDADD+= $$(${GTEST_CONFIG} --libs --ldflags) TEST_LDADD+= $$(${GTEST_CONFIG} --libs --ldflags)
TEST_LDADD+= $$(${GMOCK_CONFIG} --libs --ldflags)
TEST_OBJS+= ${TEST_SRCS:R:S/$/.o/} TEST_OBJS+= ${TEST_SRCS:R:S/$/.o/}
CLEANFILES+= ${PROG}_test ${TEST_OBJS} CLEANFILES+= ${PROG}_test ${TEST_OBJS}
GIT?= git GIT?= git
GTEST_CONFIG?= gtest-config GTEST_CONFIG?= gtest-config
GMOCK_CONFIG?= gmock-config
PKG_CONFIG?= pkg-config PKG_CONFIG?= pkg-config
beforeinstall: beforeinstall:

0
devel/android-tools-adb-devel/files/patch-adb_bugreport__test.cpp → devel/android-tools-adb/files/patch-adb_bugreport__test.cpp
View file

4
devel/android-tools-fastboot/Makefile
View file

@ -2,7 +2,7 @@
PORTNAME= android-tools-fastboot PORTNAME= android-tools-fastboot
DISTVERSIONPREFIX= android- DISTVERSIONPREFIX= android-
DISTVERSION?= 7.0.0_r1 DISTVERSION?= 7.1.0_r4
PORTREVISION?= 0 PORTREVISION?= 0
CATEGORIES= devel CATEGORIES= devel
MASTER_SITES= https://anonscm.debian.org/cgit/android-tools/android-tools.git/plain/debian/:manpage MASTER_SITES= https://anonscm.debian.org/cgit/android-tools/android-tools.git/plain/debian/:manpage
@ -28,7 +28,7 @@ GH_SUBDIR= libselinux:libselinux
.ifdef DISTVERSIONSUFFIX .ifdef DISTVERSIONSUFFIX
GH_REVISION= ${DISTVERSIONSUFFIX:S/-g//} # snapshot GH_REVISION= ${DISTVERSIONSUFFIX:S/-g//} # snapshot
.else .else
GH_REVISION= 88f64719d756 # generated by: make update-revision GH_REVISION= 75a38b87f304 # generated by: make update-revision
.endif .endif
CONFLICTS_INSTALL?= ${PORTNAME}-devel-* CONFLICTS_INSTALL?= ${PORTNAME}-devel-*

14
devel/android-tools-fastboot/distinfo
View file

@ -1,11 +1,11 @@
TIMESTAMP = 1472009581 TIMESTAMP = 1477685972
SHA256 (fastboot.1?id=706e754) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283 SHA256 (fastboot.1?id=706e754) = 2af01b064440952a82f1602691a0fecc030302722a71444946fb70d9c423d283
SIZE (fastboot.1?id=706e754) = 5906 SIZE (fastboot.1?id=706e754) = 5906
SHA256 (android-platform_system_core-android-7.0.0_r1_GH0.tar.gz) = faa44f626dfab9e604f509cc541a8e491e7e46a9de42df3a9c1e24c36fd9f8c4 SHA256 (android-platform_system_core-android-7.1.0_r4_GH0.tar.gz) = 07f61b77c07e588473cac43daf2a36ef213440aa144f1dc0af214f5c7b0529ef
SIZE (android-platform_system_core-android-7.0.0_r1_GH0.tar.gz) = 1570346 SIZE (android-platform_system_core-android-7.1.0_r4_GH0.tar.gz) = 1588982
SHA256 (jbeich-platform_system_extras-android-7.0.0_r1_GH0.tar.gz) = ff2ea6db032da70374edcd6867bd11d765a475a32d732b983d0dad6ae16e209b SHA256 (jbeich-platform_system_extras-android-7.1.0_r4_GH0.tar.gz) = 0bf738738bb2b7800069856f052757246e95d02d7404e976f002755927eed404
SIZE (jbeich-platform_system_extras-android-7.0.0_r1_GH0.tar.gz) = 79621110 SIZE (jbeich-platform_system_extras-android-7.1.0_r4_GH0.tar.gz) = 79624975
SHA256 (jbeich-platform_external_libselinux-android-7.0.0_r1_GH0.tar.gz) = bf335619fb77fc523e33d08523d20795de17a6a906b87e16fd7d79911f186a15 SHA256 (jbeich-platform_external_libselinux-android-7.1.0_r4_GH0.tar.gz) = ecb2e57302e843e23dc3fa2ff7e37fd0ac897fa2cd60ab55e6d8b704ef84f5b8
SIZE (jbeich-platform_external_libselinux-android-7.0.0_r1_GH0.tar.gz) = 59544 SIZE (jbeich-platform_external_libselinux-android-7.1.0_r4_GH0.tar.gz) = 59769
SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c SHA256 (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = ca3311ba47a5edd56c929ac9aae57c02c2c3f1636519c5f67abb00b6e3ecd75c
SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967 SIZE (mbrubeck-android-completion-c1b0656_GH0.tar.gz) = 5967