Index: head/devel/android-tools-simpleperf/Makefile
===================================================================
--- head/devel/android-tools-simpleperf/Makefile	(revision 398009)
+++ head/devel/android-tools-simpleperf/Makefile	(revision 398010)
@@ -1,47 +1,47 @@
 # $FreeBSD$
 
 PORTNAME=	android-tools-simpleperf
 DISTVERSIONPREFIX=	android-
-DISTVERSION=	m-preview-136
-DISTVERSIONSUFFIX=	-g89a2254
+DISTVERSION=	m-preview-219
+DISTVERSIONSUFFIX=	-gaf995fe
 CATEGORIES=	devel
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Android simpleperf tool
 
 LICENSE=	APACHE20
 
 BUILD_DEPENDS=	llvm-config${LLVM_VER}:${PORTSDIR}/devel/llvm${LLVM_VER}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	android:bionic,core jbeich
 GH_PROJECT=	platform_bionic:bionic platform_system_core:core \
 		platform_system_extras
-GH_TAGNAME=	${DISTVERSIONFULL:C/-[0-9].*//}-232-gb4f2112:bionic \
-		${DISTVERSIONFULL:C/-[0-9].*//}-868-gb81c410:core
+GH_TAGNAME=	${DISTVERSIONFULL:C/-[0-9].*//}-357-g55f87a0:bionic \
+		${DISTVERSIONFULL:C/-[0-9].*//}-1254-gfca4821:core
 
 USES=		compiler:c++11-lib uidfix
 BUILD_WRKSRC=	${WRKSRC}/simpleperf
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 MAKEFILE=	${FILESDIR}/Makefile
 MAKE_ENV=	BINDIR="${PREFIX}/bin" LLVM_CONFIG="llvm-config${LLVM_VER}"
 ALL_TARGET=	all
 LDFLAGS+=	-Wl,--as-needed # avoid overlinking (llvm deps)
 PLIST_FILES=	bin/simpleperf
 
 LLVM_VER?=	36 # XXX Move to DEFAULT_VERSIONS
 
 OPTIONS_DEFINE=	TEST
 
 TEST_BUILD_DEPENDS=googletest>=1.6.0:${PORTSDIR}/devel/googletest
 TEST_ALL_TARGET=simpleperf_unit_test
 
 post-extract:
 # Adjust paths relative to extras
 	@(cd ${WRKSRC_core} && ${COPYTREE_SHARE} . ${WRKSRC})
 	@${MV} ${WRKSRC_bionic} ${WRKSRC}/bionic
 
 pre-install-TEST-on:
 	${BUILD_WRKSRC}/simpleperf_unit_test
 
 .include <bsd.port.mk>
Index: head/devel/android-tools-simpleperf/distinfo
===================================================================
--- head/devel/android-tools-simpleperf/distinfo	(revision 398009)
+++ head/devel/android-tools-simpleperf/distinfo	(revision 398010)
@@ -1,6 +1,6 @@
-SHA256 (jbeich-platform_system_extras-android-m-preview-136-g89a2254_GH0.tar.gz) = 33813515ba14743085b8e95a4a74025ac4cefd7d308d5870cc8e279ef5380d4a
-SIZE (jbeich-platform_system_extras-android-m-preview-136-g89a2254_GH0.tar.gz) = 665360
-SHA256 (android-platform_bionic-android-m-preview-232-gb4f2112_GH0.tar.gz) = 88767af6ed1b4377c03aee44e61c175f69decc9169eea2b39661c940186eec5e
-SIZE (android-platform_bionic-android-m-preview-232-gb4f2112_GH0.tar.gz) = 3438328
-SHA256 (android-platform_system_core-android-m-preview-868-gb81c410_GH0.tar.gz) = e013cf5538e25d8123bb7e423ab4269826f74d0af3d44e3e316942c2b1b5a362
-SIZE (android-platform_system_core-android-m-preview-868-gb81c410_GH0.tar.gz) = 1335909
+SHA256 (jbeich-platform_system_extras-android-m-preview-219-gaf995fe_GH0.tar.gz) = e8d797e8764c693ba3f5b312368815747c9c331e7d5d2c71068ab99fedff6e29
+SIZE (jbeich-platform_system_extras-android-m-preview-219-gaf995fe_GH0.tar.gz) = 76449581
+SHA256 (android-platform_bionic-android-m-preview-357-g55f87a0_GH0.tar.gz) = bb0a72a7d84c2b18d5076581f97ac1c239329ee64f5150082f740f911be64a03
+SIZE (android-platform_bionic-android-m-preview-357-g55f87a0_GH0.tar.gz) = 3462941
+SHA256 (android-platform_system_core-android-m-preview-1254-gfca4821_GH0.tar.gz) = 0368607e5bc8e777746658f37be59d9f6c356d1265b24c0c128054c8d1b958eb
+SIZE (android-platform_system_core-android-m-preview-1254-gfca4821_GH0.tar.gz) = 1361953
Index: head/devel/android-tools-simpleperf/files/Makefile
===================================================================
--- head/devel/android-tools-simpleperf/files/Makefile	(revision 398009)
+++ head/devel/android-tools-simpleperf/files/Makefile	(revision 398010)
@@ -1,78 +1,81 @@
 # $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+=	record_test.cpp
 TEST_SRCS+=	sample_tree_test.cpp
 
+.PATH: ${.CURDIR}/darwin_support
+SRCS+=	darwin_support.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}
+CFLAGS+=-I${.CURDIR}/darwin_support/include
 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>