Merge commit '6088a9ad876314b14d24fc75cb9321f7b34bb5e7'
* commit '6088a9ad876314b14d24fc75cb9321f7b34bb5e7':
init.rc: Adjust permissions on /data/dontpanic/ so dumpstate will not need root
Merge commit '25f1a5aaffd1ef6e87d53d4fd3c14ea1b6c5b940' into eclair-plus-aosp
* commit '25f1a5aaffd1ef6e87d53d4fd3c14ea1b6c5b940':
init.rc: Adjust permissions on /data/dontpanic/ so dumpstate will not need root
Merge commit '8880093fe386ab0dcefec9ce41f8ce6f4e068b0e' into eclair-plus-aosp
* commit '8880093fe386ab0dcefec9ce41f8ce6f4e068b0e':
Fix several issues in framebuffer_service
-supports fb's with x and y offsets
-dumps the front buffer (instead of just the low end of the buffer)
-switch from mmap to read/write, for fb's with very large offsets
Change-Id: Id560790c9661f7cc3b4350a44cc29f0104831e85
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
Merge commit '27b8b3a1aab015ed8673ffd03bbf57f63adb85f0'
* commit '27b8b3a1aab015ed8673ffd03bbf57f63adb85f0':
init: Make /dev/pmem_gpu* be writable by all
Merge commit 'e67eff1c615c98bf9ad51be9e474ef9ee82b6565' into eclair-plus-aosp
* commit 'e67eff1c615c98bf9ad51be9e474ef9ee82b6565':
init: Make /dev/pmem_gpu* be writable by all
Merge commit '3cf1f5b34ec85a8cd8ca0c67f4ec80e600258539'
* commit '3cf1f5b34ec85a8cd8ca0c67f4ec80e600258539':
Add a script "accarm" for ad-hoc testing of the ARM acc compiler.
Merge commit 'e7aa14978ffc7042c257fb1bd837490ec4ec1abd' into eclair-plus-aosp
* commit 'e7aa14978ffc7042c257fb1bd837490ec4ec1abd':
Add a script "accarm" for ad-hoc testing of the ARM acc compiler.
This script copies the test file over to the ARM, runs the acc compiler
on ARM, and then prints out the results.
It also syncs the acc compiler binary over to the ARM.
STOPSHIP: The actual device entry needs to be removed once the products
that use this switch on the mmu.
Change-Id: I10afea36c8731d845382665ed3db7647f68d1276
Signed-off-by: Dima Zavin <dima@android.com>
Merge commit '8b213f1ad950c0d115a8d5a3016a267432b3c980' into eclair-plus-aosp
* commit '8b213f1ad950c0d115a8d5a3016a267432b3c980':
Fix an infinite loop in time2sub.
Implement some optimizations:
+ performing arithmetic by a small constant is 3 instructions shorter.
+ reading a local variables is 1 instruction shorter.
+ constant array indexing (e.g. p[5]) is 5 instructions shorter.
The problem is that time_t is signed, and the original code relied on the
fact that (X + c < X) in case of overflow for c >= 0. Unfortunately, this
condition is only guaranteed by the standard for unsigned arithmetic, and
the gcc 4.4.0 optimizer did completely remove the corresponding test from
the code. This resulted in a missing boundary check, and an infinite loop.
The problem is solved by testing explicitely for TIME_T_MIN and TIME_T_MAX
in the loop that uses this.
Also fix increment_overflow and long_increment_overflow which were buggy
for exactly the same reasons.
Also remove some compiler warnings.
Note: a similar fix was performed in bionic/libc
Merge commit '3ebc52eb710c75a1ef51dca7c767701bab74a9ee'
* commit '3ebc52eb710c75a1ef51dca7c767701bab74a9ee':
Fix a bug that prevented the "generic" product builds from working in the emulator.
Merge commit '2f21659d4565afd65da1be07c28317a3cb4287a1' into eclair-plus-aosp
* commit '2f21659d4565afd65da1be07c28317a3cb4287a1':
Fix a bug that prevented the "generic" product builds from working in the emulator.
Merge commit '24e78ecfb93bceea39c2d58af5eae2aa6467d395'
* commit '24e78ecfb93bceea39c2d58af5eae2aa6467d395':
Move ARM disassembler out of libacc and into the acc command-line tool.
Merge commit '983b8bb01c3abc8e338f7779ee62fd6aab2f56a0'
* commit '983b8bb01c3abc8e338f7779ee62fd6aab2f56a0':
Fix a call to memset(3) with reversed arguments.
Merge commit 'b97d616d028f801b6e914c9a29d9177de2177020'
* commit 'b97d616d028f801b6e914c9a29d9177de2177020':
Added a hack that makes the SD card world-writable when the sampling
Merge commit 'aae43f9e7582a403b8c4f20d59e26c36bbde5219'
* commit 'aae43f9e7582a403b8c4f20d59e26c36bbde5219':
init.rc: Make /data/dontpanic files readable only by the system process.
Merge commit '0e1f612d5d5caca3f8c8d7f1689a96148a24afd2' into eclair-plus-aosp
* commit '0e1f612d5d5caca3f8c8d7f1689a96148a24afd2':
Move ARM disassembler out of libacc and into the acc command-line tool.
Merge commit 'd9a16d6e7daf8e58ebc7760530d9b015dbe4678d' into eclair-plus-aosp
* commit 'd9a16d6e7daf8e58ebc7760530d9b015dbe4678d':
Fix a call to memset(3) with reversed arguments.
Merge commit 'd62ae8f12f7b6b7fa13366a064ad4d483a3312e5' into eclair-plus-aosp
* commit 'd62ae8f12f7b6b7fa13366a064ad4d483a3312e5':
Added a hack that makes the SD card world-writable when the sampling
* changes:
Added a hack that makes the SD card world-writable when the sampling profiler is turned out. I'll remove this once egnor has the drop box in system_server working.
Merge commit '9332482ed2945174d94615f0720f88702cb92667' into eclair-plus-aosp
* commit '9332482ed2945174d94615f0720f88702cb92667':
init.rc: Make /data/dontpanic files readable only by the system process.
This also ensures that emulator-specific files /init.goldfish.rc and
/system/etc/init.goldfish.sh are never part of -user builds, which
correspond to production devices.
Merge commit 'ef41d2381ddf5cf6a1ad2cfd531cac8b943d20fc'
* commit 'ef41d2381ddf5cf6a1ad2cfd531cac8b943d20fc':
Turn an assert into an error to handle bad struct members more gracefully.
Merge commit '45a35237f34c92f8e51eb42eb01e3a054d20aa23'
* commit '45a35237f34c92f8e51eb42eb01e3a054d20aa23':
Generate an error for the use of an undeclared struct.
Merge commit 'c0b74902b85c538c9dac549aa5b213a3fb3edc57' into eclair-plus-aosp
* commit 'c0b74902b85c538c9dac549aa5b213a3fb3edc57':
Turn an assert into an error to handle bad struct members more gracefully.
Arve Hjønnevåg