Naseer Ahmed
9c3892558f
am 6b1ba118
: am 3ef4fecd
: bionic: update processed msm_mdp.h
...
* commit '6b1ba1184a5e0884686b63da837a85f8c861d1fc':
bionic: update processed msm_mdp.h
2012-10-03 01:03:04 -07:00
Naseer Ahmed
6b1ba1184a
am 3ef4fecd
: bionic: update processed msm_mdp.h
...
* commit '3ef4fecd30c22f3c17c1dadfce4527e858b42e7e':
bionic: update processed msm_mdp.h
2012-10-03 00:57:49 -07:00
Naseer Ahmed
3ef4fecd30
bionic: update processed msm_mdp.h
...
-- Has display commit ioctl
Bug: 7274951
Change-Id: If2d47edf3ada418e8c61a2acc7b79fb3422f3473
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-10-02 23:37:34 -07:00
Andy McFadden
51c7167d22
am 7c67e4e4
: am 98957db5
: Merge "Test flags before using "info"" into jb-mr1-dev
...
* commit '7c67e4e423f7608c50a1fc7c355d87593cfdbcca':
Test flags before using "info"
2012-10-02 15:27:09 -07:00
Andy McFadden
7c67e4e423
am 98957db5
: Merge "Test flags before using "info"" into jb-mr1-dev
...
* commit '98957db5536e93724c2e9e6bd19d5063f9d4dc2c':
Test flags before using "info"
2012-10-02 15:24:25 -07:00
Andy McFadden
98957db553
Merge "Test flags before using "info"" into jb-mr1-dev
2012-10-02 15:23:20 -07:00
Andreas Huber
3a0aa5e0a0
am cafbc940
: am 2e0452cb
: bionic: update processed msm_vidc_enc.h
...
* commit 'cafbc9404310828ecddc55a1eed5fc897008b1f3':
bionic: update processed msm_vidc_enc.h
2012-10-02 14:42:35 -07:00
Andreas Huber
cafbc94043
am 2e0452cb
: bionic: update processed msm_vidc_enc.h
...
* commit '2e0452cbd1f5b981fbadb4021198d2c27ec1cde3':
bionic: update processed msm_vidc_enc.h
2012-10-02 14:40:02 -07:00
Andreas Huber
2e0452cbd1
bionic: update processed msm_vidc_enc.h
...
Updated kernel headers to support a video encoder ioctl to preprend each IDR
frame with SPS/PPS.
related-to-bug: 7245308
Change-Id: I7244c521690d69a905deb19940a04fd4f2e06935
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-10-02 14:34:03 -07:00
Andy McFadden
f84bc8d6f6
Test flags before using "info"
...
Our debugger signal catcher expects to receive three args, but if
somebody cleared SA_SIGINFO we only get one, and bad things happen
when we try to use the second one. Test to see if SA_SIGINFO is
still set before we try to use the argument.
Bug: 7272866
Change-Id: If682a2262fe8a575f3802fb0c60a53eea3082456
2012-10-02 14:30:41 -07:00
Elliott Hughes
92e6de6f94
am b95ad82f
: am 95a2a7f3
: Merge "Fix MIPS build."
...
* commit 'b95ad82f7d175a4f79eb0cbf6caedf0653603590':
Fix MIPS build.
2012-10-02 11:33:03 -07:00
Elliott Hughes
b95ad82f7d
am 95a2a7f3
: Merge "Fix MIPS build."
...
* commit '95a2a7f325330830d6227aa683948b325e38e653':
Fix MIPS build.
2012-10-02 11:31:30 -07:00
Elliott Hughes
95a2a7f325
Merge "Fix MIPS build."
2012-10-02 11:22:33 -07:00
Elliott Hughes
857fed50cb
Fix MIPS build.
...
ARM and x86 have custom memcpy implementations, but MIPS relies on the generic
one, which I recently moved.
Change-Id: I9e49243f63b27a4123f2c6623d6286ec82d333c7
2012-10-02 11:20:07 -07:00
Elliott Hughes
80a2983272
am 90172541
: am b98204a9
: Merge "Move non-upstream code into the libc/bionic directory."
...
* commit '90172541866696a5a46fae7ff7e186126ee37318':
Move non-upstream code into the libc/bionic directory.
2012-10-02 09:25:12 -07:00
Elliott Hughes
9017254186
am b98204a9
: Merge "Move non-upstream code into the libc/bionic directory."
...
* commit 'b98204a9fb5c84478a9710163df395486443c7f6':
Move non-upstream code into the libc/bionic directory.
2012-10-02 09:22:03 -07:00
The Android Open Source Project
4cf143f1c8
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I2c724a28984aa03b2887b3db58bd59699b428e85
2012-10-02 09:16:33 -07:00
Elliott Hughes
b98204a9fb
Merge "Move non-upstream code into the libc/bionic directory."
2012-10-02 09:13:34 -07:00
Elliott Hughes
15edd80a69
am 39d7c607
: am 75f43525
: Merge "Always take GCC\'s definition of NULL."
...
* commit '39d7c6072dc4d587c32405f3c7de12e60559cfc8':
Always take GCC's definition of NULL.
2012-10-01 18:21:35 -07:00
Elliott Hughes
39d7c6072d
am 75f43525
: Merge "Always take GCC\'s definition of NULL."
...
* commit '75f43525550c5cad3980f7dd125cb838836790b8':
Always take GCC's definition of NULL.
2012-10-01 18:18:06 -07:00
Elliott Hughes
75f4352555
Merge "Always take GCC's definition of NULL."
2012-10-01 18:11:20 -07:00
Elliott Hughes
7d56ccbfaa
Always take GCC's definition of NULL.
...
There's a (bad) definition of NULL in <linux/stddef.h>, and this
definition of NULL, and the One True definition in the <stddef.h> provided
by the compiler. This change at least kills one of the bad duplicates.
Killing the <linux/stddef.h> one is harder, because it's in a generated
file.
Change-Id: Iea4ccb12d6758199f312ea9cd753b84322d5c471
2012-10-01 17:56:58 -07:00
Elliott Hughes
a89864a20b
Move non-upstream code into the libc/bionic directory.
...
I'll need at least one more pass, because there's some upstream code
lurking in libc/bionic, but this is still a step in the right direction.
Change-Id: I55927315972da8327ae01c5240ed587db17e8462
2012-10-01 17:35:49 -07:00
Elliott Hughes
baa7ee0370
am bb7dfcd3
: am d3bf954e
: Merge "Remove useless #defines and incorrect claims from header files."
...
* commit 'bb7dfcd3b8744fdf37857375ffe279d2b87a8b22':
Remove useless #defines and incorrect claims from header files.
2012-10-01 15:52:56 -07:00
Elliott Hughes
bb7dfcd3b8
am d3bf954e
: Merge "Remove useless #defines and incorrect claims from header files."
...
* commit 'd3bf954e9ffbdee8d732ccb6ad6143dc31b605fc':
Remove useless #defines and incorrect claims from header files.
2012-10-01 15:50:51 -07:00
Elliott Hughes
d3bf954e9f
Merge "Remove useless #defines and incorrect claims from header files."
2012-10-01 15:37:18 -07:00
Elliott Hughes
0cc0d250fd
Remove useless #defines and incorrect claims from header files.
...
The various __need_* macros were write-only.
Change-Id: Id3cca34188e0801fdf93a038b22f2817226ad9c2
2012-10-01 15:12:40 -07:00
Elliott Hughes
a54d08a7c1
am a428bc12
: am fe712e6c
: Merge "Upgrade seed48 too."
...
* commit 'a428bc1288e28a05b036597db4f0409fa7f3923d':
Upgrade seed48 too.
2012-10-01 14:47:52 -07:00
Elliott Hughes
a428bc1288
am fe712e6c
: Merge "Upgrade seed48 too."
...
* commit 'fe712e6caedccbbba24bda8429cb0b8cc6057ff1':
Upgrade seed48 too.
2012-10-01 14:46:46 -07:00
Elliott Hughes
fe712e6cae
Merge "Upgrade seed48 too."
2012-10-01 14:38:09 -07:00
Elliott Hughes
6ed5bc12da
am b650111a
: am cd195eba
: Merge "Upgrade to the current NetBSD rand implementation."
...
* commit 'b650111a11b84d7c91145c4f29b58b5742afa572':
Upgrade to the current NetBSD rand implementation.
2012-10-01 14:15:36 -07:00
Elliott Hughes
31a1060a5a
Upgrade seed48 too.
...
Missed this in 774c7f54ff
.
Change-Id: Ic24fd67f003d0e2d192cfb08f96f63024ca817eb
2012-10-01 14:14:21 -07:00
Elliott Hughes
b650111a11
am cd195eba
: Merge "Upgrade to the current NetBSD rand implementation."
...
* commit 'cd195eba1f9235b9b9d4dda70142d927b1b9802d':
Upgrade to the current NetBSD rand implementation.
2012-10-01 14:13:16 -07:00
Elliott Hughes
cd195eba1f
Merge "Upgrade to the current NetBSD rand implementation."
2012-10-01 14:05:09 -07:00
Elliott Hughes
774c7f54ff
Upgrade to the current NetBSD rand implementation.
...
Also add basic unit tests.
Change-Id: I7fc7ef61d47c1e8fdf8b8eff67a635220c3afd56
2012-10-01 13:53:41 -07:00
Elliott Hughes
068f33981d
am 0fa6279f
: am 5b6346f6
: Merge "bionic: linker: Need update the map->l_addr for execution."
...
* commit '0fa6279f394bb5a5cfeb7996d28b8fd2365477e7':
bionic: linker: Need update the map->l_addr for execution.
2012-10-01 09:23:11 -07:00
Elliott Hughes
0fa6279f39
am 5b6346f6
: Merge "bionic: linker: Need update the map->l_addr for execution."
...
* commit '5b6346f6d5dca4022fe0044dd2807c19ac596788':
bionic: linker: Need update the map->l_addr for execution.
2012-10-01 09:21:08 -07:00
Elliott Hughes
5b6346f6d5
Merge "bionic: linker: Need update the map->l_addr for execution."
2012-10-01 09:09:17 -07:00
The Android Automerger
f27642c082
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-30 06:59:14 -07:00
Jean-Baptiste Queru
adc32bc3b1
Merge from jb-mr1-aah-dev
...
Change-Id: Iea13ecd8b6edd42b3dc9c59755d51c1bb36afe4a
2012-09-28 17:06:59 -07:00
Saurabh Shah
c556da9ed7
am 204b26b4
: bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
...
* commit '204b26b4402249566e0190154cddb2cfc2cf42a7':
bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
2012-09-28 15:00:03 -07:00
Saurabh Shah
52b4ccbc49
am 204b26b4
: bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
...
* commit '204b26b4402249566e0190154cddb2cfc2cf42a7':
bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
2012-09-28 14:59:36 -07:00
Jean-Baptiste Queru
de1efebdca
Merge from jb-mr1-aah-dev
...
Change-Id: I56ae94f8efe9eecedc17da2f573e8fde2b80d151
2012-09-28 14:29:56 -07:00
Saurabh Shah
204b26b440
bionic: Update msm_mdp.h with new MSMFB_OVERLAY_COMMIT ioctl
...
This change adds msm_mdp.h header changes to bionic.
This IOCTL is a substitute for PAN on external panel. It waits for DMAE to
finish before returning and avoid delays in the PAN path.
Bug: 7249589
Acked-by: Arun Kumar K.R <akumarkr@codeaurora.org>
Change-Id: I4b04a4538919ffcb994699a432c4322e9f94e870
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-09-28 13:46:13 -07:00
Elliott Hughes
8e1a87b547
am bb892a1b
: am d03bfe68
: Merge "Define ssize_t if necessary."
...
* commit 'bb892a1b63a2e88c98a2ba31aa659b7efac44e4f':
Define ssize_t if necessary.
2012-09-28 10:28:30 -07:00
Elliott Hughes
bb892a1b63
am d03bfe68
: Merge "Define ssize_t if necessary."
...
* commit 'd03bfe689a6e29aa010a927741f42c08f89ef04d':
Define ssize_t if necessary.
2012-09-28 10:27:06 -07:00
Elliott Hughes
d03bfe689a
Merge "Define ssize_t if necessary."
2012-09-28 10:16:58 -07:00
Elliott Hughes
422b6ef92c
Define ssize_t if necessary.
...
Change-Id: I63801cc1f09be5e4ca20a6da7ec3366ba6441afd
2012-09-28 10:15:52 -07:00
Elliott Hughes
fb1e192e12
am 72b08af3
: am f9163dd1
: Merge "Add getdelim(3) and getline(3) to bionic"
...
* commit '72b08af300703a08bf2081304ab81b9e4dba003c':
Add getdelim(3) and getline(3) to bionic
2012-09-28 09:55:02 -07:00
Elliott Hughes
72b08af300
am f9163dd1
: Merge "Add getdelim(3) and getline(3) to bionic"
...
* commit 'f9163dd1f0f6cbd7b8305fa1b2ce46754ed95278':
Add getdelim(3) and getline(3) to bionic
2012-09-28 09:53:08 -07:00