Index: head/devel/android-tools-simpleperf/files/Makefile
===================================================================
--- head/devel/android-tools-simpleperf/files/Makefile	(revision 397250)
+++ head/devel/android-tools-simpleperf/files/Makefile	(revision 397251)
@@ -1,73 +1,78 @@
 # $FreeBSD$
 
 PROG_CXX=simpleperf
 NO_MAN=
 BINDIR?=/usr/bin
 
 SRCS+=	callchain.cpp
 SRCS+=	cmd_dumprecord.cpp
 SRCS+=	cmd_help.cpp
 SRCS+=	cmd_report.cpp
 SRCS+=	command.cpp
 SRCS+=	dso.cpp
 SRCS+=	environment_fake.cpp
 SRCS+=	event_attr.cpp
 SRCS+=	event_type.cpp
 SRCS+=	main.cpp
 SRCS+=	perf_regs.cpp
 SRCS+=	read_elf.cpp
 SRCS+=	record.cpp
 SRCS+=	record_file_reader.cpp
 SRCS+=	sample_tree.cpp
 SRCS+=	thread_tree.cpp
 SRCS+=	utils.cpp
 
 TEST_SRCS+=	command_test.cpp
-TEST_SRCS+=	gtest_main.cpp
 TEST_SRCS+=	record_test.cpp
 TEST_SRCS+=	sample_tree_test.cpp
 
 # required by simpleperf
 .PATH: ${.CURDIR}/../base
 SRCS+=	file.cpp
 SRCS+=	logging.cpp
 SRCS+=	stringprintf.cpp
 SRCS+=	strings.cpp
+TEST_SRCS+= file_test.cpp
+TEST_SRCS+= logging_test.cpp
+TEST_SRCS+= stringprintf_test.cpp
+TEST_SRCS+= strings_test.cpp
+TEST_SRCS+= test_main.cpp
+TEST_SRCS+= test_utils.cpp
 
 # required by base
 .PATH:	${.CURDIR}/../liblog
 SRCS+=	fake_log_device.c
 SRCS+=	logd_write.c
 CFLAGS.logd_write.c+=	-DFAKE_LOG_DEVICE=1
 
 # required by base
 .PATH: ${.CURDIR}/../libcutils
 SRCS+= threads.c
 
 CFLAGS+=-D_WITH_GETLINE
 CFLAGS+=-DUSE_BIONIC_UAPI_HEADERS
 CFLAGS+=-I${.CURDIR}/darwin_support
 CFLAGS+=-I${.CURDIR}/../include
 CFLAGS+=-I${.CURDIR}/../base/include
 CFLAGS+=-I${.CURDIR}/../bionic/libc/kernel
 CFLAGS+=$$(${LLVM_CONFIG} --cppflags)
 CFLAGS+=${CFLAGS.${.IMPSRC:T}}
 
 CXXFLAGS+=-std=gnu++11
 CXXFLAGS+=${CFLAGS:N-std*}
 
 TEST_CFLAGS+=	$$(${GTEST_CONFIG} --cppflags)
 .for f in ${TEST_SRCS}
 CFLAGS.${f}+=	${TEST_CFLAGS}
 .endfor
 
 LDADD+=		$$(${LLVM_CONFIG} --system-libs --libs --ldflags)
 TEST_LDADD+=	$$(${GTEST_CONFIG} --libs --ldflags)
 
 LLVM_CONFIG?=	llvm-config
 GTEST_CONFIG?=	gtest-config
 
 simpleperf_unit_test: ${SRCS:R:S/$/.o/:Nmain.o} ${TEST_SRCS:R:S/$/.o/}
 	${CXX} ${CXXFLAGS} ${LDFLAGS} -o $@ $> ${LDADD} ${TEST_LDADD}
 
 .include <bsd.prog.mk>
Index: head/devel/android-tools-simpleperf/files/patch-base_stringprintf__test.cpp
===================================================================
--- head/devel/android-tools-simpleperf/files/patch-base_stringprintf__test.cpp	(nonexistent)
+++ head/devel/android-tools-simpleperf/files/patch-base_stringprintf__test.cpp	(revision 397251)
@@ -0,0 +1,10 @@
+--- base/stringprintf_test.cpp.orig	2015-08-12 23:28:08 UTC
++++ base/stringprintf_test.cpp
+@@ -18,6 +18,7 @@
+ 
+ #include <gtest/gtest.h>
+ 
++#include <errno.h>
+ #include <string>
+ 
+ TEST(StringPrintfTest, HexSizeT) {

Property changes on: head/devel/android-tools-simpleperf/files/patch-base_stringprintf__test.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property