svn commit: r422319 - in head/devel/android-tools-simpleperf: . files
Jan Beich
jbeich at FreeBSD.org
Sat Sep 17 12:34:23 UTC 2016
Author: jbeich
Date: Sat Sep 17 12:34:20 2016
New Revision: 422319
URL: https://svnweb.freebsd.org/changeset/ports/422319
Log:
devel/android-tools-simpleperf: update to 7.0.0.r1 (nougat)
Note, reading .gnu_debugdata (lzma code) isn't supported in the release.
Changes: https://android.googlesource.com/platform/system/extras/+log/ea4a5a4..android-7.0.0_r1/simpleperf
Added:
head/devel/android-tools-simpleperf/files/patch-liblog_logger__write.c (contents, props changed)
- copied, changed from r422318, head/devel/android-tools-adb/files/patch-liblog_logger__write.c
head/devel/android-tools-simpleperf/files/patch-simpleperf_gtest__main.cpp (contents, props changed)
Deleted:
head/devel/android-tools-simpleperf/files/patch-libcutils_threads.c
head/devel/android-tools-simpleperf/files/patch-liblog_logd__write.c
Modified:
head/devel/android-tools-simpleperf/Makefile (contents, props changed)
head/devel/android-tools-simpleperf/distinfo (contents, props changed)
head/devel/android-tools-simpleperf/files/Makefile (contents, props changed)
head/devel/android-tools-simpleperf/files/patch-base_file.cpp (contents, props changed)
head/devel/android-tools-simpleperf/files/patch-base_logging.cpp (contents, props changed)
head/devel/android-tools-simpleperf/files/patch-base_stringprintf__test.cpp (contents, props changed)
head/devel/android-tools-simpleperf/pkg-descr (contents, props changed)
Modified: head/devel/android-tools-simpleperf/Makefile
==============================================================================
--- head/devel/android-tools-simpleperf/Makefile Sat Sep 17 12:26:14 2016 (r422318)
+++ head/devel/android-tools-simpleperf/Makefile Sat Sep 17 12:34:20 2016 (r422319)
@@ -2,28 +2,21 @@
PORTNAME= android-tools-simpleperf
DISTVERSIONPREFIX= android-
-DISTVERSION= n-preview-1-116
-DISTVERSIONSUFFIX= -gea4a5a4
+DISTVERSION= 7.0.0_r1
CATEGORIES= devel
MAINTAINER= jbeich at FreeBSD.org
COMMENT= Android simpleperf tool
-LICENSE= APACHE20 PD
-LICENSE_COMB= multi
-LICENSE_FILE_PD= ${WRKSRC}/lzma/NOTICE
+LICENSE= APACHE20
BUILD_DEPENDS= llvm-config${LLVM_VER}:devel/llvm${LLVM_VER}
USE_GITHUB= yes
-GH_ACCOUNT= android:bionic,core jbeich:DEFAULT,lzma
+GH_ACCOUNT= android:bionic,core jbeich
GH_PROJECT= platform_bionic:bionic platform_system_core:core \
- platform_system_extras platform_external_lzma:lzma
-GH_MYTAG= ${DISTVERSIONPREFIX}${DISTVERSION:C/-[0-9]*$//}
-GH_TAGNAME= ${GH_MYTAG}-249-g5f1de52:bionic \
- ${GH_MYTAG}-554-g371e7ea170d7:core \
- ${GH_MYTAG}-6-ge43f249:lzma
-GH_SUBDIR= bionic:bionic lzma:lzma
+ platform_system_extras
+GH_SUBDIR= bionic:bionic
USES= compiler:c++11-lib uidfix
BUILD_WRKSRC= ${WRKSRC}/simpleperf
Modified: head/devel/android-tools-simpleperf/distinfo
==============================================================================
--- head/devel/android-tools-simpleperf/distinfo Sat Sep 17 12:26:14 2016 (r422318)
+++ head/devel/android-tools-simpleperf/distinfo Sat Sep 17 12:34:20 2016 (r422319)
@@ -1,8 +1,7 @@
-SHA256 (jbeich-platform_system_extras-android-n-preview-1-116-gea4a5a4_GH0.tar.gz) = 6bfedb3758797d21c901daff05f3b0a29785e5cee241ceeb9a14524e7166676d
-SIZE (jbeich-platform_system_extras-android-n-preview-1-116-gea4a5a4_GH0.tar.gz) = 76583329
-SHA256 (android-platform_bionic-android-n-preview-1-249-g5f1de52_GH0.tar.gz) = f82cc222e0de014fa8752b622073af6be748136a5aefd498a171b34948cc5785
-SIZE (android-platform_bionic-android-n-preview-1-249-g5f1de52_GH0.tar.gz) = 3492411
-SHA256 (android-platform_system_core-android-n-preview-1-554-g371e7ea170d7_GH0.tar.gz) = 6672ae5e1088335f2f721b357f178163c19259abe38a8b307ebb0c8b37b291cb
-SIZE (android-platform_system_core-android-n-preview-1-554-g371e7ea170d7_GH0.tar.gz) = 1536079
-SHA256 (jbeich-platform_external_lzma-android-n-preview-1-6-ge43f249_GH0.tar.gz) = 176f7ad8c41794e144da17d3263e4a95b13528b9a425e80882e9ee4cbe2e5f9a
-SIZE (jbeich-platform_external_lzma-android-n-preview-1-6-ge43f249_GH0.tar.gz) = 704323
+TIMESTAMP = 1472009581
+SHA256 (jbeich-platform_system_extras-android-7.0.0_r1_GH0.tar.gz) = ff2ea6db032da70374edcd6867bd11d765a475a32d732b983d0dad6ae16e209b
+SIZE (jbeich-platform_system_extras-android-7.0.0_r1_GH0.tar.gz) = 79621110
+SHA256 (android-platform_bionic-android-7.0.0_r1_GH0.tar.gz) = 60c75732796cffeff2006f63d556abb7af462939cdc710ff79edf56d26535d74
+SIZE (android-platform_bionic-android-7.0.0_r1_GH0.tar.gz) = 3514221
+SHA256 (android-platform_system_core-android-7.0.0_r1_GH0.tar.gz) = faa44f626dfab9e604f509cc541a8e491e7e46a9de42df3a9c1e24c36fd9f8c4
+SIZE (android-platform_system_core-android-7.0.0_r1_GH0.tar.gz) = 1570346
Modified: head/devel/android-tools-simpleperf/files/Makefile
==============================================================================
--- head/devel/android-tools-simpleperf/files/Makefile Sat Sep 17 12:26:14 2016 (r422318)
+++ head/devel/android-tools-simpleperf/files/Makefile Sat Sep 17 12:34:20 2016 (r422319)
@@ -47,13 +47,13 @@ TEST_SRCS+= test_utils.cpp
# required by base
.PATH: ${.CURDIR}/../liblog
+SRCS+= config_write.c
SRCS+= fake_log_device.c
-SRCS+= logd_write.c
-CPPFLAGS.logd_write.c+= -DFAKE_LOG_DEVICE=1
-
-# required by base
-.PATH: ${.CURDIR}/../libcutils
-SRCS+= threads.c
+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 libziparchive
.PATH: ${.CURDIR}/../libutils
@@ -63,24 +63,6 @@ SRCS+= FileMap.cpp
.PATH: ${.CURDIR}/../libziparchive
SRCS+= zip_archive.cc
-# required by simpleperf
-.PATH: ${.CURDIR}/../lzma/C
-SRCS+= 7zCrc.c
-SRCS+= 7zCrcOpt.c
-SRCS+= Bra86.c
-SRCS+= Bra.c
-SRCS+= BraIA64.c
-SRCS+= CpuArch.c
-SRCS+= Delta.c
-SRCS+= Lzma2Dec.c
-SRCS+= LzmaDec.c
-SRCS+= Sha256.c
-SRCS+= Xz.c
-SRCS+= XzCrc64.c
-SRCS+= XzCrc64Opt.c
-SRCS+= XzDec.c
-
-CPPFLAGS+= -D_7ZIP_ST
CPPFLAGS+= -D_WITH_GETLINE
CPPFLAGS+= -DUSE_BIONIC_UAPI_HEADERS
CPPFLAGS+= -Doff64_t=off_t
@@ -93,7 +75,6 @@ CPPFLAGS+= -I${.CURDIR}/nonlinux_support
CPPFLAGS+= -I${.CURDIR}/../include
CPPFLAGS+= -I${.CURDIR}/../base/include
CPPFLAGS+= -I${.CURDIR}/../bionic/libc/kernel
-CPPFLAGS+= -I${.CURDIR}/../lzma/C
CPPFLAGS+= $$(${LLVM_CONFIG} --cppflags)
CPPFLAGS+= ${CPPFLAGS.${.IMPSRC:T}}
CXXFLAGS+= -std=gnu++11
Modified: head/devel/android-tools-simpleperf/files/patch-base_file.cpp
==============================================================================
--- head/devel/android-tools-simpleperf/files/patch-base_file.cpp Sat Sep 17 12:26:14 2016 (r422318)
+++ head/devel/android-tools-simpleperf/files/patch-base_file.cpp Sat Sep 17 12:34:20 2016 (r422319)
@@ -1,10 +1,11 @@
---- base/file.cpp.orig 2015-08-12 23:28:08 UTC
+--- base/file.cpp.orig 2016-08-08 21:10:17 UTC
+++ base/file.cpp
-@@ -21,6 +21,7 @@
+@@ -21,6 +21,8 @@
#include <sys/stat.h>
#include <sys/types.h>
++#include <cstdio> // BUFSIZ
+#include <cstring> // strerror
#include <string>
- #include "base/macros.h" // For TEMP_FAILURE_RETRY on Darwin.
+ #include "android-base/macros.h" // For TEMP_FAILURE_RETRY on Darwin.
Modified: head/devel/android-tools-simpleperf/files/patch-base_logging.cpp
==============================================================================
--- head/devel/android-tools-simpleperf/files/patch-base_logging.cpp Sat Sep 17 12:26:14 2016 (r422318)
+++ head/devel/android-tools-simpleperf/files/patch-base_logging.cpp Sat Sep 17 12:34:20 2016 (r422319)
@@ -1,7 +1,7 @@
---- base/logging.cpp.orig 2015-08-12 23:28:08 UTC
+--- base/logging.cpp.orig 2016-08-08 21:10:17 UTC
+++ base/logging.cpp
-@@ -23,12 +23,14 @@
- #include <libgen.h>
+@@ -25,7 +25,7 @@
+ #include <time.h>
// For getprogname(3) or program_invocation_short_name.
-#if defined(__ANDROID__) || defined(__APPLE__)
@@ -9,14 +9,16 @@
#include <stdlib.h>
#elif defined(__GLIBC__)
#include <errno.h>
+@@ -35,6 +35,8 @@
+ #include <sys/uio.h>
#endif
-+#include <cstring> // strlen
++#include <cstring> // strrchr
+#include <cstdio> // fprintf
#include <iostream>
#include <limits>
#include <sstream>
-@@ -66,6 +68,14 @@
+@@ -71,6 +72,14 @@
#include <unistd.h>
#elif defined(_WIN32)
#include <windows.h>
@@ -30,8 +32,8 @@
+#include <stdint.h>
#endif
- static pid_t GetThreadId() {
-@@ -77,6 +89,14 @@ static pid_t GetThreadId() {
+ #if defined(_WIN32)
+@@ -88,6 +97,14 @@ static thread_id GetThreadId() {
return syscall(__NR_gettid);
#elif defined(_WIN32)
return GetCurrentThreadId();
Modified: head/devel/android-tools-simpleperf/files/patch-base_stringprintf__test.cpp
==============================================================================
--- head/devel/android-tools-simpleperf/files/patch-base_stringprintf__test.cpp Sat Sep 17 12:26:14 2016 (r422318)
+++ head/devel/android-tools-simpleperf/files/patch-base_stringprintf__test.cpp Sat Sep 17 12:34:20 2016 (r422319)
@@ -1,4 +1,4 @@
---- base/stringprintf_test.cpp.orig 2015-08-12 23:28:08 UTC
+--- base/stringprintf_test.cpp.orig 2015-09-17 22:58:36 UTC
+++ base/stringprintf_test.cpp
@@ -18,6 +18,7 @@
Copied and modified: head/devel/android-tools-simpleperf/files/patch-liblog_logger__write.c (from r422318, head/devel/android-tools-adb/files/patch-liblog_logger__write.c)
==============================================================================
Added: head/devel/android-tools-simpleperf/files/patch-simpleperf_gtest__main.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/android-tools-simpleperf/files/patch-simpleperf_gtest__main.cpp Sat Sep 17 12:34:20 2016 (r422319)
@@ -0,0 +1,22 @@
+libc++ fails with higher default.
+
+ [ RUN ] logging.LOG
+ base/logging_test.cpp:162: Failure
+ Expected: (output.length()) > (strlen("foobar")), actual: 0 vs 6
+ [ FAILED ] logging.LOG (1 ms)
+ [ RUN ] logging.PLOG
+ base/logging_test.cpp:252: Failure
+ Expected: (output.length()) > (strlen("foobar")), actual: 0 vs 6
+ [ FAILED ] logging.PLOG (0 ms)
+
+--- simpleperf/gtest_main.cpp 2016-06-28 07:04:19.000000000 +0000
++++ simpleperf/gtest_main.cpp
+@@ -137,7 +137,7 @@ class SavedPerfHardenProperty {
+ int main(int argc, char** argv) {
+ InitLogging(argv, android::base::StderrLogger);
+ testing::InitGoogleTest(&argc, argv);
+- android::base::LogSeverity log_severity = android::base::WARNING;
++ android::base::LogSeverity log_severity = android::base::GetMinimumLogSeverity();
+
+ for (int i = 1; i < argc; ++i) {
+ if (strcmp(argv[i], "-t") == 0 && i + 1 < argc) {
Modified: head/devel/android-tools-simpleperf/pkg-descr
==============================================================================
--- head/devel/android-tools-simpleperf/pkg-descr Sat Sep 17 12:26:14 2016 (r422318)
+++ head/devel/android-tools-simpleperf/pkg-descr Sat Sep 17 12:34:20 2016 (r422319)
@@ -1,2 +1,7 @@
-simpleperf is a minimal Linux perf implementation for extracting
-sampling information out of perf.data.
+Simpleperf is a native profiling tool for Android. Its command-line
+interface supports broadly the same options as the linux-tools perf,
+but also supports various Android-specific improvements.
+
+This package only provides subcommands to read perf.data.
+
+WWW: https://android.googlesource.com/platform/prebuilts/simpleperf/
More information about the svn-ports-all
mailing list