aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2015-04-02Merge "Tell perf that bionic has strlcpy(3)."master-soongElliott Hughes
2015-04-02Tell perf that bionic has strlcpy(3).Elliott Hughes
Change-Id: I7d8406dbc623c7cf7391d7c688773eb5dd360519
2015-03-18Merge "Add NOTICE and MODULE_LICENSE files"Conley Owens
2015-03-12Add NOTICE and MODULE_LICENSE filesConley Owens
Change-Id: Idcb99e2682ff634e84187a2f848c0ef865f78f9b
2015-03-12Merge "Remove the perfhost target."Elliott Hughes
2015-03-12Remove the perfhost target.Elliott Hughes
The perfhost target isn't useful, because you already have perf installed. What's more, we were never building the whole thing anyway and were dlopen'ing parts of the one you already had installed. Let's stop kidding ourselves and just admit that we're happy with the one on the host. (IDEs are going to need something that works on Mac OS and Windows anyway, so this isn't useful for them.) Change-Id: I8018dfc5645ec5d01c257af6f461e1e3db30fb53
2015-02-24am 39e3915d: Merge "Suppress int-to-pointer-cast warnings."Dan Albert
* commit '39e3915d410f13d5cafdef2598676c0f58477306': Suppress int-to-pointer-cast warnings.
2015-02-24Merge "Suppress int-to-pointer-cast warnings."Dan Albert
2015-02-24am d51066c5: Merge "Track elfutils 0.161 update."Elliott Hughes
* commit 'd51066c5de95d5a8db5478b59268a15003fb6407': Track elfutils 0.161 update.
2015-02-24Merge "Track elfutils 0.161 update."Elliott Hughes
2015-02-23Suppress int-to-pointer-cast warnings.Dan Albert
Note that we never actually generate this file from the bison source; we check in the generated source provided by the released tarball. This change should go upstream (in the right file, of course). Change-Id: I992bc57f6ad7fb7a6d80d243e559d07eedd5a741
2015-02-19Merge commit '77db2216fd4cf7464089fcc24ebd543413dcade3' into HEADBill Yi
2015-02-18Track elfutils 0.161 update.Elliott Hughes
Change-Id: I7c59ea90406caf2a3aefb498f1e392072b328375
2015-02-19Merge "Fix perf build."Elliott Hughes
2015-02-18Fix perf build.Elliott Hughes
I think I accidentally rebuilt the elfutils directory instead. Change-Id: Ie8dc47908abc9cff18c2185535c82e87903a39bd
2015-02-19Merge "Lose the version number from the directory name."Elliott Hughes
2015-02-18Lose the version number from the directory name.Elliott Hughes
This way, next time we sync with upstream we'll have an actual diff to look at. Change-Id: I6474968f55ba42696c2ee894586d34f84f9f6630
2015-02-17Merge "Pull the elfutils headers in via the library dependencies."Elliott Hughes
2015-02-17Pull the elfutils headers in via the library dependencies.Elliott Hughes
Also build perf in one step rather than building an otherwise-useless libperf.a first. Change-Id: Id2d9023902a60856037c26fa28a7961266127e91
2015-02-05am 542b3ad7: Merge "Use the libcxxabi __cxa_demangle."Elliott Hughes
* commit '542b3ad7f760e55cb775f4633219a44173cb3d5e': Use the libcxxabi __cxa_demangle.
2015-02-05Merge "Use the libcxxabi __cxa_demangle."Elliott Hughes
2015-02-05Use the libcxxabi __cxa_demangle.Elliott Hughes
Bug: 18930951 Change-Id: Ib3574eb6178b8540a61fad0cbf0e8b347922c6f0
2015-01-09am c8fcdaa0: Merge "Disable clang only for the arm target."Chih-Hung Hsieh
* commit 'c8fcdaa0d0d4b4c93660fea15bee06e4893796ad': Disable clang only for the arm target.
2015-01-09Merge "Disable clang only for the arm target."Chih-Hung Hsieh
2015-01-09Disable clang only for the arm target.Chih-Hung Hsieh
Also ignore some clang warnings when compiled for other targets. BUG: 17167262 Change-Id: Id80f9ba3061ac71387a29df7a28c80468f9e9aee
2014-11-15am f608ab24: Merge "These bugs only affect arm32, so allow clang."Dan Albert
* commit 'f608ab242d9b37e4b4c087314806071202d71f41': These bugs only affect arm32, so allow clang.
2014-11-15Merge "These bugs only affect arm32, so allow clang."Dan Albert
2014-11-14These bugs only affect arm32, so allow clang.Dan Albert
Change-Id: Ife749976c0cf9f6ec46f4e47d25c9941406c2799
2014-10-26am 20824f23: am f6395419: Merge "Move Clang only flags into LOCAL_CLANG_CFLAGS."Chih-Hung Hsieh
* commit '20824f23e0a220c038ae9dce43f3f9cb30ac15c8':
2014-09-23am f6395419: Merge "Move Clang only flags into LOCAL_CLANG_CFLAGS."Chih-Hung Hsieh
* commit 'f63954197ea5e1fa300fa6c561e2f5b0a67d2d1f': Move Clang only flags into LOCAL_CLANG_CFLAGS.
2014-09-23am f6395419: Merge "Move Clang only flags into LOCAL_CLANG_CFLAGS."Chih-Hung Hsieh
* commit 'f63954197ea5e1fa300fa6c561e2f5b0a67d2d1f': Move Clang only flags into LOCAL_CLANG_CFLAGS.
2014-09-23Merge "Move Clang only flags into LOCAL_CLANG_CFLAGS."Chih-Hung Hsieh
2014-09-22Move Clang only flags into LOCAL_CLANG_CFLAGS.Chih-Hung Hsieh
Gcc does not recognize -Wno-int-conversion. Change-Id: Iafbe6c726221c6a8a43bb1c1d32aa14f93872cb2
2014-09-02am 159fffda: Merge "Disable clang due to missing __aeabi_read_tp."Chih-Hung Hsieh
* commit '159fffda3a19be150d72de62bcf88bb0d225dbf1': Disable clang due to missing __aeabi_read_tp.
2014-09-02Merge "Disable clang due to missing __aeabi_read_tp."Chih-Hung Hsieh
2014-09-02Disable clang due to missing __aeabi_read_tp.Chih-Hung Hsieh
BUG: 17167262 BUG: 16696563 Change-Id: I76ee72153f1072aca6d5188ecc09ed3f9b5d471f
2014-08-20am 823f2555: Merge "Remove an elfutils-related hack from perf(1)."Elliott Hughes
* commit '823f2555fc4d3520db79268334ddf3e431ade2a0': Remove an elfutils-related hack from perf(1).
2014-08-20am 7fe4f6cd: Merge "Use GNU basename(3) in perf(1) now bionic has it."Elliott Hughes
* commit '7fe4f6cde2ecf3b0904249add745acb228123e3f': Use GNU basename(3) in perf(1) now bionic has it.
2014-08-19Merge "Remove an elfutils-related hack from perf(1)."Elliott Hughes
2014-08-19Remove an elfutils-related hack from perf(1).Elliott Hughes
Change-Id: Icd5873f7f0a89daf1ca5fa3d5af2d090be050ab5
2014-08-18am 20f6b4bd: DO NOT MERGETim Murray
* commit '20f6b4bde1e6b6c7518a1ad23e07a44027ba1a88': DO NOT MERGE
2014-08-18DO NOT MERGEandroid-wear-5.1.1_r1android-wear-5.1.0_r1android-wear-5.0.0_r1android-l-preview_r2android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releasel-previewTim Murray
Fix build break for lmp-dev-gpl. Change-Id: Ifdc6824e2e4ac62b9e287eaa87682b88cef22c6a
2014-08-16resolved conflicts for merge of 879f55ca to lmp-dev-plus-aospElliott Hughes
Change-Id: Ie0f3afb5eac6a9a4129584f8252402c8b2484686
2014-08-16Merge "Use GNU basename(3) in perf(1) now bionic has it."Elliott Hughes
2014-08-19Use GNU basename(3) in perf(1) now bionic has it.Elliott Hughes
This brings us another step closer to upstream. Bug: 11860789 Change-Id: I90fbcda69cd794b6dedbc38a56700ca4de73b7bd
2014-08-15Merge "Sync with upstream perf-3.12."Elliott Hughes
2014-08-15Sync with upstream perf-3.12.Elliott Hughes
Modulo a handful of changes (now marked with #if defined(ANDROID_PATCHES)), this brings us in line with upstream kernel source. I'll look at adding a GNU-style basename(3) to bionic and seeing if we can fix libelf to not need <stdio_ext.h> (or add <stdio_ext.h>) and then come back to remove more of the hacks. I also got rid of a lot of the stuff that we can just get from our uapi headers, rather than have a second copy here. Change-Id: Ifcddea46708471c86ee6fee6f31295875c7308bb
2014-08-15am b0ae117f: Merge "Fix perf(1) for aarch64 toolchains." into lmp-devElliott Hughes
* commit 'b0ae117f65375dfc05ddbc7ba0ecdbd0292e7ea0': Fix perf(1) for aarch64 toolchains.
2014-08-15am a5e2d07b: Use \'cat\' as perf\'s default pager on Android.Elliott Hughes
* commit 'a5e2d07be6c6a1442b7eca78495b6a0afc25fb39': Use 'cat' as perf's default pager on Android.
2014-08-15am 35868b6a: Fix the Darwin perf build.Elliott Hughes
* commit '35868b6a64b3d0641a6a39155e7a4038661053b9': Fix the Darwin perf build.
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 18:36:23 +0000