system-corennnn

Fork

Merge change 21845 into eclair

* changes:
Allow redefinition of macros.

Allow redefinition of macros.

Example:

#define A 3
#define A 4

This used to do strange things, but now works as it should.

am 9d129689: Merge change 21834 into eclair

Merge commit '9d1296898a93293e64529d548189bfc8185ffd08'

* commit '9d1296898a93293e64529d548189bfc8185ffd08':
Allow '//'-style comments in #defines.

Merge change 21834 into eclair

* changes:
Allow '//'-style comments in #defines.

Allow '//'-style comments in #defines.

am 29f34260: Merge change 21812 into eclair

Merge commit '29f3426016116678c122b37cf6d5d40bdfec7749'

* commit '29f3426016116678c122b37cf6d5d40bdfec7749':
Allow parenthesized expressions as the value of defines

Merge change 21812 into eclair

* changes:
Allow parenthesized expressions as the value of defines

Allow parenthesized expressions as the value of defines

For example, this now works:

#define A (1 + 2)

Note that we still don't support defines with argument lists, so this is
still illegal:

#define A(X) (X + 2)

Also in this change: The compiler test script allows command-line
arguments to disable testing on ARM and to disable testing the output
of the old OTCC compiler.

Disabling testing on ARM is handy for developing front-end code when no
device or emulator is available.

Disabling testing OTCC output is handy for some 64-bit Linux environments,
because the original OTCC needs some tweaking to be fully compatible, and
I don't have time to investigate this problem right now.

am 9d881764: fix part of [2017702] OpenGL bugs with alpha values of 1.0 in the source during blending into 8888 buffers

Merge commit '9d881764173ce16badb6f1098ba5cf44b36f9aec'

* commit '9d881764173ce16badb6f1098ba5cf44b36f9aec':
fix part of [2017702] OpenGL bugs with alpha values of 1.0 in the source during blending into 8888 buffers

fix part of [2017702] OpenGL bugs with alpha values of 1.0 in the source during blending into 8888 buffers

when ONE / ONE_MINUS_SRC_ALPHA blending mode was used, the code wasn't saturating the color component.
the reason was that this mode is used for premltiplied alpha blending, however, if used with a non
premultiplied source, the color component would wrap.

unfortunately, this costs 6 extra cycles per pixels, however... "correctness" prevails.

this should not impact the UI since it's using h/w acceleration most of the time it also doesn't
impact games which should be using h/w GL. This change will slow the emulator down a bit.

Added -s flag to ls.

This may not be useful, and may actually be misleading since yaffs2
doesn't track the blocks used for each file (it just divides the length
down by 512). I'm submitting it because yaffs2 isn't the only
filesystem we'll ever use.

I also changed some sprintf to snprintf, mostly out of paranoid habit.

am 7f5b1a2b: (-s ours) do not merge: cherry-picked ecd23c09e87d7088285f8b7c2eeb98815c2e69e0 from master branch

Merge commit '7f5b1a2b317874a9009d20ed4d3789a7cb508ca4'

* commit '7f5b1a2b317874a9009d20ed4d3789a7cb508ca4':
do not merge: cherry-picked ecd23c09e87d7088285f8b7c2eeb98815c2e69e0 from master branch

do not merge: cherry-picked ecd23c09e87d7088285f8b7c2eeb98815c2e69e0 from master branch

add optimized SHA1 algorithm

This optimized implementation of the SHA1 algorithm is about 28%
faster than the old one (on sapphire hardware) but assumes
little-endianness. Add it, but continue using the old implementation
on big-endian hardware.

Merge change 20547

* changes:
Try not to crash with no error message.

Fix bug of mmc.c not checking read_file result.
This bug causes segment fault when reading name node of
SDIO mmc device's /sys file, which is not existed at all.

Signed-off-by: Xinyu Chen <xinyu.chen@freescale.com>

vold: Check partitions 1-4 instead of 0-3

In mmc_bootstrap_mmcblk, bootstrap partitions 1-4 instead of 0-3, since
that's how the kernel labels them. Additionally, use the NDOSPART constant
from diskmbr.h instead of hardcoding 4 when scanning partitions.

am e3baafd8: BUG 2033924: Add AdbWinUsbApi.dll to prebuilt for Windows SDK

Merge commit 'e3baafd85a5fecd1714441455e3f75f26b5c381e'

* commit 'e3baafd85a5fecd1714441455e3f75f26b5c381e':
BUG 2033924: Add AdbWinUsbApi.dll to prebuilt for Windows SDK

am c52c6021: (-s ours) DO NOT MERGE adb: Remove adbd from simulator build.

Merge commit 'c52c602171cb29c4a4c38005f321cf95d50d3418'

* commit 'c52c602171cb29c4a4c38005f321cf95d50d3418':
DO NOT MERGE adb: Remove adbd from simulator build.

am 704aa833: (-s ours) DO NOT MERGE cherry-pick "adb reboot" from master:

Merge commit '704aa833382a73f8e02d49b7e9c2aef9a49c65bd'

* commit '704aa833382a73f8e02d49b7e9c2aef9a49c65bd':
DO NOT MERGE cherry-pick "adb reboot" from master:

init: set the correct kgsl device node permissions

BUG 2033924: Add AdbWinUsbApi.dll to prebuilt for Windows SDK

adb: Fix infinite loop in Linux host device discovery.

Signed-off-by: Mike Lockwood <lockwood@android.com>

DO NOT MERGE adb: Remove adbd from simulator build.

It no longer compiles without recent kernel headers.

Signed-off-by: Mike Lockwood <lockwood@android.com>

DO NOT MERGE cherry-pick "adb reboot" from master:

adb: add "adb reboot" command.

This will allow rebooting the device via adb on any build, including user builds.
An optional argument can be provided
(for example, "adb reboot bootloader" or adb reboot recovery")

Signed-off-by: Mike Lockwood <lockwood@android.com>

Try not to crash with no error message.

adb: print better error message when there are insufficient permissions for a device.

Now, a command like "adb shell" will print "insufficient permissions for device"
instead of "device not found" if adb does not have permissions to communicate with the device.

Signed-off-by: Mike Lockwood <lockwood@android.com>

adb: update call to register_usb_transport in Mac and Windows builds.

Signed-off-by: Mike Lockwood <lockwood@android.com>

adb: On Linux, detect USB devices for which adb does not have permissions to communicate with.

adb devices will now list devices without adequate file system permissions in /dev/bus/usb as:

List of devices attached
???????????? no permissions

Signed-off-by: Mike Lockwood <lockwood@android.com>

Merge change 20502

* changes:
we actually have to saturate when doing premultilied blending with opengl