summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix pointer-to-int and int-to-pointer warnings.Dan Albert2015-02-233-3/+8
| | | | Change-Id: If534cbcf2c3e644270572cbf829ba9b5acab29e6
* Merge "Add missing <unistd.h> include for close."Elliott Hughes2015-02-201-0/+1
|\
| * Add missing <unistd.h> include for close.Elliott Hughes2015-02-191-0/+1
|/ | | | Change-Id: Iebce6d74eecb8c275e800b7f47f74bbd4374860d
* Merge "egl: Remove old tuna BGRA vs RGBA workaround."Jesse Hall2015-02-182-33/+2
|\
| * egl: Remove old tuna BGRA vs RGBA workaround.Alistair Strachan2015-02-122-33/+2
| | | | | | | | | | | | | | | | | | | | | | Some time before kitkat, a workaround was put in place to keep tuna working with obsolete PowerVR GPU drivers. The tuna product was dropped in AOSP for kitkat, but the workaround remained. There are still a number of devices shipping with OMAP4 processors, and this workaround continues to be applied on those products even when it is not required. The effect is that virtual display CTS will fail on those devices.
* | Merge "Add missing <sys/file.h> include for flock."Elliott Hughes2015-02-171-0/+1
|\ \ | |/ |/|
| * Add missing <sys/file.h> include for flock.Elliott Hughes2015-02-161-0/+1
|/ | | | Change-Id: I5c9bb4aa74d8a36d44e086bbcb5d60876727ce4c
* Merge "Remove -z option."Christopher Ferris2015-02-103-49/+8
|\
| * Remove -z option.Christopher Ferris2015-02-093-49/+8
|/ | | | | | | | | | | This option doesn't work with the current selinux protections and doesn't serve much of a purpose. You can get the same results running this: dumpstate | gzip > /data/local/tmp/dump.txt.gz Bug: 19271141 Change-Id: Icc76200df33dc708e30c556ec8a0f393f995fe7c
* Merge "Add better timeout mechanism for running commands."Christopher Ferris2015-02-041-18/+69
|\
| * Add better timeout mechanism for running commands.Christopher Ferris2015-02-031-18/+69
|/ | | | Change-Id: I60fc9e7d59c3e0e4b8b2f69f79c6903240bfd131
* Merge "Add missing includes."Elliott Hughes2015-01-302-0/+2
|\
| * Add missing includes.Elliott Hughes2015-01-292-0/+2
|/ | | | Change-Id: I1dad32ab459c25063a70cf52100a29d00fea3a90
* Merge "Switch dumpstate to "ip link list"."Elliott Hughes2015-01-281-1/+2
|\
| * Switch dumpstate to "ip link list".Elliott Hughes2015-01-281-1/+2
|/ | | | Change-Id: Ia1db51c866890f09fbd4316764dea5982554598f
* Merge "Kill HAVE_PTHREADS."Yabin Cui2015-01-272-15/+5
|\
| * Kill HAVE_PTHREADS.Yabin Cui2015-01-262-15/+5
|/ | | | | Bug: 19083585 Change-Id: I355491de945590f43c82bdcb7968b01b4bff6e06
* Merge "Use register numbers instead of register names"Jesse Hall2015-01-263-22/+22
|\
| * Use register numbers instead of register namesNikola Veljkovic2015-01-193-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | Avoid ambiguity by using register numbers. Register names are interpreted depending on the ABI. Fixes the issue with mips64 gcc, where registers t0-t4 are translated into $8-$11 (o32 ABI) instead of $12-$15 (o64 ABI). Also, use t9 ($25) for storing function address (in getProcAddress.cpp). Change-Id: I12ef5cd98bf14dab3c01f2756889cc02856c1cd8
* | Merge "Move atrace from the obsolete bzero to memset."Elliott Hughes2015-01-251-1/+2
|\ \
| * | Move atrace from the obsolete bzero to memset.Elliott Hughes2015-01-251-1/+2
| | | | | | | | | | | | | | | | | | (This file wasn't including <strings.h> for bzero or <string.h> for memset.) Change-Id: Icef0e0dbfd36ebd21058cfd8c747e0a17aee8308
* | | Merge "Refactor of the bugreport code."Christopher Ferris2015-01-233-57/+94
|\ \ \
| * | | Refactor of the bugreport code.Christopher Ferris2015-01-233-57/+94
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented these changes: - Make this code C++. - Avoid hangs by adding a timeout. - Add the necessary TEMP_FAILURE_RETRY calls. - Restructure the code a bit. Bug: 18800936 Change-Id: Iba9f86a4c7beee4f0f36e51234855f4c0834db47
* | | Merge "[MIPS] Further opengl support for mips64 and mipsr6"Jesse Hall2015-01-223-14/+115
|\ \ \ | | |/ | |/|
| * | [MIPS] Further opengl support for mips64 and mipsr6Duane Sand2015-01-193-14/+115
| |/ | | | | | | | | | | | | | | | | | | | | Combines 4 patches by Dragoslav and Douglas: Use t9 to hold the address of the called function. Add support for gl binding. Fix inline assembly code to be R6 compatible. Fix some more inline assembly code to be R6 compatible. Change-Id: I0b899813790b2ba4ca538bb21692014cc1933f66
* | Merge "Restore Region::set(uint32_t, uint32_t)"Dan Stoza2015-01-212-0/+7
|\ \ | |/ |/|
| * Restore Region::set(uint32_t, uint32_t)Bernhard Rosenkraenzer2014-12-222-0/+7
| | | | | | | | | | | | | | | | | | | | The Region::set(uint32_t,uint32_t) ABI is used by the Nexus 10 graphics driver blobs. After commit dd883c0b08d2a60f89542b9b9f5fdabcb14885c7, Nexus 10 blobs need a rebuild unless the old ABI is added back Change-Id: I138dcc1cc281b8d3cde0021282bf874054ec4eaf Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
* | Merge "Follow StrictMode refactoring."Jeff Sharkey2015-01-161-1/+1
|\ \
| * | Follow StrictMode refactoring.Jeff Sharkey2015-01-141-1/+1
| | | | | | | | | | | | | | | Bug: 18335678 Change-Id: Iea920cfa26b5ebfd77b4601c9e6e65b21599342a
* | | Merge "Use the timeout stack dump functions."Christopher Ferris2015-01-151-5/+13
|\ \ \
| * | | Use the timeout stack dump functions.Christopher Ferris2015-01-151-5/+13
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the native stack dumping functions that allows time outs. If debuggerd locks up, before a bugreport would hang forever. Now it will timeout properly and still get all of the other information. Bug: 18766581 (cherry picked from commit 457731f69e3106b5aae8fc04f9565af1d875876c) Change-Id: I39e8e9c60209e3ef9efac795fedb8e1edce2bd3e
* | | Merge "Revert "Revert "Update protobuf library from 2.3 to 2.6."""Jeff Davidson2015-01-1510-5256/+13
|\ \ \ | |/ / |/| |
| * | Revert "Revert "Update protobuf library from 2.3 to 2.6.""Jeff Davidson2015-01-1210-5256/+13
| | | | | | | | | | | | | | | | | | This reverts commit bca4262dac55cc59b28d6fde658d5f8a254fcc2d. Change-Id: I8ecd859340779dfacffba4c6d1a44c5cdbdfceed
* | | Merge "Replace all instances of intptr_t with uintptr_t."Riley Andrews2015-01-131-8/+8
|\ \ \
| * | | Replace all instances of intptr_t with uintptr_t.Riley Andrews2015-01-131-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling 32 bit binaries against a 64 bit binder interface, implicit promotions of intptr_t types to uint64_t for fields in the binder ioctl structures can result in invalid pointers because of sign extension.
* | | | Merge "Fix signed/unsigned comparison warnings in driver interface test."Riley Andrews2015-01-131-7/+7
|\ \ \ \ | |/ / /
| * | | Fix signed/unsigned comparison warnings in driver interface test.Riley Andrews2015-01-121-7/+7
| | | |
* | | | Merge "[MIPS] Build libGLES for mips64, mips32r6"Brian Carlstrom2015-01-133-3/+5
|\ \ \ \ | |/ / / |/| | |
| * | | [MIPS] Build libGLES for mips64, mips32r6Duane Sand2015-01-123-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | For now, use generic C code instead of assembler. Change-Id: I604ecdcde2d5373f1f68ab97a63a80667b630846
* | | | Merge "surfaceflinger: use Mutex timedLock instead of tryLock loop"Jesse Hall2015-01-121-9/+6
|\ \ \ \
| * | | | surfaceflinger: use Mutex timedLock instead of tryLock loopJesse Hall2015-01-101-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than trying to acquire the state lock without waiting three times at 1 second intervals in SurfaceFlinger::dump(), just try to acquire the lock once with a 1 second timeout. Avoids spurious mutex acquire failures that lead to flaky com.android.cts.jank.opengl.CtsHostJankOpenGl results. Bug: 18842510 Change-Id: I00ce6109647de2aef8831dd2f8fa98652ba7f4e0
* | | | | Merge "Revert "Update protobuf library from 2.3 to 2.6.""Jeff Davidson2015-01-1210-13/+5256
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Revert "Update protobuf library from 2.3 to 2.6."Jeff Davidson2015-01-1210-13/+5256
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a42cdf169060e1bb65c77bc8a394d266403d8583. Change-Id: I8f75e6fcc921041ebdfd35c4724134fcb2c739c6
* | | | | Merge "Update protobuf library from 2.3 to 2.6."Jeff Davidson2015-01-1210-5256/+13
|\ \ \ \ \ | |/ / / /
| * | | | Update protobuf library from 2.3 to 2.6.Jeff Davidson2015-01-0810-5256/+13
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Remove generated cpp/h files for gltrace.proto as we can use the build system to generate these dynamically. Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
* | | | Merge "Fix message when a command times out."Christopher Ferris2015-01-121-1/+1
|\ \ \ \
| * | | | Fix message when a command times out.Christopher Ferris2015-01-091-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | The previous version printed out the nanoseconds elapsed, not seconds. Change-Id: I10f6d7bf7b7a4647658313ed83781fda6fd744a5
* | | | Merge "We have POSIX clocks, and we don't need to ask for the openssl headers."Elliott Hughes2015-01-102-9/+2
|\ \ \ \ | |/ / / |/| | |
| * | | We have POSIX clocks, and we don't need to ask for the openssl headers.Elliott Hughes2015-01-092-9/+2
|/ / / | | | | | | | | | | | | | | | | | | This code doesn't need to run on the Mac, and the BoringSSL transition will be easier without references to external/openssl. Change-Id: I14ea11fa2911af0f4e95e69636e6a2c26126cbe0
* | | Merge "Installd: Disallow relocation for decryption"Andreas Gampe2015-01-071-15/+24
|\ \ \ | |/ / |/| |