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
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
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
Elliott Hughes
f9163dd1f0
Merge "Add getdelim(3) and getline(3) to bionic"
2012-09-28 09:44:24 -07:00
Irina Tirdea
eac9eb462e
Add getdelim(3) and getline(3) to bionic
...
Some userspace programs (e.g. perf) need getline.
Changes:
() add getdelim.c, getline.c from NetBSD (http://netbsd.org/ ) under the
NetBSD Foundation's (TNF) license ("2 clause" Berkeley-style license).
() add stub for reentrant.h header that is needed by getdelim.c
() add tests for getdelim(3) and getline(3).
() update NOTICE file.
Change-Id: I22ed82dd5904b9d7a3695535c04f502be3c27c5d
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
2012-09-27 11:38:57 -07:00
Elliott Hughes
209d67d448
am fd6ca57f
: am e4030e0b
: Merge "Fix several compiler warnings."
...
* commit 'fd6ca57f24cbfd8a8074ee6f1c22dd973f1b172f':
Fix several compiler warnings.
2012-09-26 16:07:02 -07:00
Elliott Hughes
fd6ca57f24
am e4030e0b
: Merge "Fix several compiler warnings."
...
* commit 'e4030e0bfc427e755477bbea69afe60308a62d91':
Fix several compiler warnings.
2012-09-26 16:04:51 -07:00
Elliott Hughes
e4030e0bfc
Merge "Fix several compiler warnings."
2012-09-26 15:51:01 -07:00
Elliott Hughes
bdc514700d
am 2c29bcf7
: am 827a2604
: Merge "Replace __unused in kernel headers with __linux_unused to avoid conflicts with __unused macro in sys/cdefs.h"
...
* commit '2c29bcf77f0d7dd7fce284ac0c17ff12663413d0':
Replace __unused in kernel headers with __linux_unused to avoid conflicts with __unused macro in sys/cdefs.h
2012-09-26 15:19:22 -07:00
Elliott Hughes
2c29bcf77f
am 827a2604
: Merge "Replace __unused in kernel headers with __linux_unused to avoid conflicts with __unused macro in sys/cdefs.h"
...
* commit '827a2604ee660df80feb231a1f8bcc96ea6e64ce':
Replace __unused in kernel headers with __linux_unused to avoid conflicts with __unused macro in sys/cdefs.h
2012-09-26 15:17:07 -07:00
Elliott Hughes
827a2604ee
Merge "Replace __unused in kernel headers with __linux_unused to avoid conflicts with __unused macro in sys/cdefs.h"
2012-09-26 14:58:11 -07:00
Elliott Hughes
ac184b2142
Fix several compiler warnings.
...
Change-Id: I55caa50a5937442734f4fcbdb4edf1c70f335bf8
2012-09-26 14:20:22 -07:00
Elliott Hughes
0792223a8a
am dd9fbc86
: am 8e630dac
: Merge "Simple tests for dladdr(3)."
...
* commit 'dd9fbc8646178dc34a92c5fbc0adc8b503cc3cd9':
Simple tests for dladdr(3).
2012-09-26 12:19:34 -07:00
Elliott Hughes
66569e3d53
am a48d5e5f
: am 855dde44
: Merge "Fix tmpfile(3)."
...
* commit 'a48d5e5f127df0f76b49e046be042f46f211e8bc':
Fix tmpfile(3).
2012-09-26 12:19:33 -07:00
Elliott Hughes
dd9fbc8646
am 8e630dac
: Merge "Simple tests for dladdr(3)."
...
* commit '8e630dacf61307e4681f04fc6b5ee593f30d91d0':
Simple tests for dladdr(3).
2012-09-26 12:18:14 -07:00
Elliott Hughes
a48d5e5f12
am 855dde44
: Merge "Fix tmpfile(3)."
...
* commit '855dde44266e3c8384ea419f51f9a5c748253eda':
Fix tmpfile(3).
2012-09-26 12:18:13 -07:00
Elliott Hughes
8e630dacf6
Merge "Simple tests for dladdr(3)."
2012-09-26 12:10:56 -07:00
Elliott Hughes
855dde4426
Merge "Fix tmpfile(3)."
2012-09-26 12:04:59 -07:00
Elliott Hughes
91875dcd6e
Fix tmpfile(3).
...
This could be better, but at least now it works.
Change-Id: I88b7cf3f7ce8e5fa0b3fe678b7d1679a68ffffc9
2012-09-26 12:02:17 -07:00
Elliott Hughes
8e15b08ae2
Simple tests for dladdr(3).
...
Change-Id: I22160b7fc9b950ea19adb6da42af2f893f4fe5d5
2012-09-26 11:44:01 -07:00
Nick Kralevich
06abf4edbf
am 5989ed5c
: am 25937d36
: Merge "FORTIFY_SOURCE: add umask check"
...
* commit '5989ed5cb8a1d11c140aa61a718e386c2cc88307':
FORTIFY_SOURCE: add umask check
2012-09-26 11:14:12 -07:00