aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-04-03 14:52:26 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-04-03 14:52:26 +0000
commit1f1e9247c2356a325ed1e3af4cd05d693e707809 (patch)
treeaf68dfceda22d5183f0ac2964fba587c9e0013fc
parent5a3f986d1c56af44a39cc497ebeb71a3211c0f8c (diff)
parent5814f6a19e71deda251d2849185a60474d0fbb19 (diff)
downloadlinux-tools-perf-marshmallow-dev.tar.gz
am 5814f6a1: am 77006d8a: Merge "Tell perf that bionic has strlcpy(3)."android-m-preview-2android-m-preview-1android-m-previewandroid-lego-6.0.1_r2android-lego-6.0.1_r1android-cts-6.0_r9android-cts-6.0_r8android-cts-6.0_r7android-cts-6.0_r6android-cts-6.0_r5android-cts-6.0_r4android-cts-6.0_r32android-cts-6.0_r31android-cts-6.0_r30android-cts-6.0_r3android-cts-6.0_r29android-cts-6.0_r28android-cts-6.0_r27android-cts-6.0_r26android-cts-6.0_r25android-cts-6.0_r24android-cts-6.0_r23android-cts-6.0_r22android-cts-6.0_r21android-cts-6.0_r20android-cts-6.0_r2android-cts-6.0_r19android-cts-6.0_r18android-cts-6.0_r17android-cts-6.0_r16android-cts-6.0_r15android-cts-6.0_r14android-cts-6.0_r13android-cts-6.0_r12android-cts-6.0_r1android-6.0.1_r9android-6.0.1_r81android-6.0.1_r80android-6.0.1_r8android-6.0.1_r79android-6.0.1_r78android-6.0.1_r77android-6.0.1_r74android-6.0.1_r73android-6.0.1_r72android-6.0.1_r70android-6.0.1_r7android-6.0.1_r69android-6.0.1_r68android-6.0.1_r67android-6.0.1_r66android-6.0.1_r65android-6.0.1_r63android-6.0.1_r62android-6.0.1_r61android-6.0.1_r60android-6.0.1_r59android-6.0.1_r58android-6.0.1_r57android-6.0.1_r56android-6.0.1_r55android-6.0.1_r54android-6.0.1_r53android-6.0.1_r52android-6.0.1_r51android-6.0.1_r50android-6.0.1_r5android-6.0.1_r49android-6.0.1_r48android-6.0.1_r47android-6.0.1_r46android-6.0.1_r45android-6.0.1_r43android-6.0.1_r42android-6.0.1_r41android-6.0.1_r40android-6.0.1_r4android-6.0.1_r33android-6.0.1_r32android-6.0.1_r31android-6.0.1_r30android-6.0.1_r3android-6.0.1_r28android-6.0.1_r27android-6.0.1_r26android-6.0.1_r25android-6.0.1_r24android-6.0.1_r22android-6.0.1_r21android-6.0.1_r20android-6.0.1_r18android-6.0.1_r17android-6.0.1_r16android-6.0.1_r13android-6.0.1_r12android-6.0.1_r11android-6.0.1_r10android-6.0.1_r1android-6.0.0_r7android-6.0.0_r6android-6.0.0_r5android-6.0.0_r41android-6.0.0_r4android-6.0.0_r3android-6.0.0_r26android-6.0.0_r25android-6.0.0_r24android-6.0.0_r23android-6.0.0_r2android-6.0.0_r13android-6.0.0_r12android-6.0.0_r11android-6.0.0_r1marshmallow-releasemarshmallow-mr3-releasemarshmallow-mr2-releasemarshmallow-mr1-releasemarshmallow-mr1-devmarshmallow-dr1.6-releasemarshmallow-dr1.5-releasemarshmallow-dr1.5-devmarshmallow-dr-releasemarshmallow-dr-lego-releasemarshmallow-dr-dragon-releasemarshmallow-dr-devmarshmallow-devmarshmallow-cts-releasem-preview
* commit '5814f6a19e71deda251d2849185a60474d0fbb19': Tell perf that bionic has strlcpy(3).
-rw-r--r--src/tools/perf/Android.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/perf/Android.mk b/src/tools/perf/Android.mk
index de8f979..4330a07 100644
--- a/src/tools/perf/Android.mk
+++ b/src/tools/perf/Android.mk
@@ -210,6 +210,7 @@ common_predefined_macros := \
-DPERF_VERSION='"perf.3.12_android"' \
-DHAVE_ELF_GETPHDRNUM \
-DHAVE_CPLUS_DEMANGLE \
+ -DHAVE_STRLCPY \
-DLIBELF_SUPPORT \
-DLIBELF_MMAP \
-DNO_NEWT_SUPPORT \