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
Nick Kralevich
5989ed5cb8
am 25937d36
: Merge "FORTIFY_SOURCE: add umask check"
...
* commit '25937d36a0639593520d2765c59736c40095f0ae':
FORTIFY_SOURCE: add umask check
2012-09-26 11:12:34 -07:00
Nick Kralevich
25937d36a0
Merge "FORTIFY_SOURCE: add umask check"
2012-09-26 10:59:29 -07:00
Elliott Hughes
c323317810
am 00f33977
: am 3307bff0
: Merge "Revert dl_fbase initialization to the address where the shared object is loaded."
...
* commit '00f339771b7b5bca1abeb375feb3ce9a04f6daa7':
Revert dl_fbase initialization to the address where the shared object is loaded.
2012-09-26 10:45:06 -07:00
Elliott Hughes
00f339771b
am 3307bff0
: Merge "Revert dl_fbase initialization to the address where the shared object is loaded."
...
* commit '3307bff0232a00f879053e94a5f37f1ca1256f7c':
Revert dl_fbase initialization to the address where the shared object is loaded.
2012-09-26 10:43:00 -07:00
Elliott Hughes
3307bff023
Merge "Revert dl_fbase initialization to the address where the shared object is loaded."
2012-09-26 10:38:10 -07:00
Nick Kralevich
cd587701c8
FORTIFY_SOURCE: add umask check
...
Verify that the call to umask makes sense. While this wouldn't
have detected bug 7094213 (because the low order bits were all zero),
it might detect other similar bugs.
References: https://code.google.com/p/android-source-browsing/source/detail?r=acba45cc4b1f98f67fcdeda2f7c13ed57659b92a&repo=platform--libcore
Change-Id: I966a531d6b3cf8e1c5eacd69bd3cbec475b5fa58
2012-09-26 10:19:31 -07:00
The Android Open Source Project
db2b9d052b
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I5d92da8a0dae14bcd6a61f1e015f818d25066763
2012-09-26 09:05:40 -07:00
Raghu Gandham
0e77287209
Replace __unused in kernel headers with __linux_unused to avoid
...
conflicts with __unused macro in sys/cdefs.h
Change-Id: Ice664397e0b7c7a90795012f30be5e43a9675525
2012-09-25 17:54:43 -07:00
Raghu Gandham
e6dc2a664e
Revert dl_fbase initialization to the address where the shared object is loaded.
...
Change-Id: If868cab774a1ae5ff370208216cecda9b8c3b9fd
2012-09-25 15:58:01 -07:00
The Android Automerger
9014818f61
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-25 06:59:12 -07:00
Elliott Hughes
354867d702
am 0eb4f255
: am 6e0e03c3
: Merge "Add the cleaned kernel headers"
...
* commit '0eb4f255d2dc1778b9a5fabb0f65c81ac4dad4a4':
Add the cleaned kernel headers
2012-09-24 13:50:04 -07:00
Elliott Hughes
0eb4f255d2
am 6e0e03c3
: Merge "Add the cleaned kernel headers"
...
* commit '6e0e03c38bc0e864225b89b3fb273fb56ded8940':
Add the cleaned kernel headers
2012-09-24 13:47:29 -07:00
Elliott Hughes
a06e11cc34
am c746bed8
: am 7b0377ed
: Merge "[MIPS] Removed the unused header"
...
* commit 'c746bed88931fab8abcc4d01a5c53b95fff1ba8f':
[MIPS] Removed the unused header
2012-09-24 13:40:53 -07:00
Elliott Hughes
28bd96cc0b
am d5c654c0
: am 3b6914bf
: Merge "Fix dlsym and dladdr to use load_bias instead of base"
...
* commit 'd5c654c053bb100cb2d4a71260a507e20eb30e79':
Fix dlsym and dladdr to use load_bias instead of base
2012-09-24 13:40:42 -07:00
Elliott Hughes
6e0e03c38b
Merge "Add the cleaned kernel headers"
2012-09-24 13:39:33 -07:00
Elliott Hughes
c746bed889
am 7b0377ed
: Merge "[MIPS] Removed the unused header"
...
* commit '7b0377eda03abc9db79faa244e28aea1ac7b64da':
[MIPS] Removed the unused header
2012-09-24 12:41:20 -07:00
Raghu Gandham
bfeb8a98b6
Add the cleaned kernel headers
...
Change-Id: Ied4e3ca765672ebaebe9d4d0909b3278c2ff3cd8
2012-09-24 12:33:57 -07:00
Elliott Hughes
7b0377eda0
Merge "[MIPS] Removed the unused header"
2012-09-24 12:24:01 -07:00
Raghu Gandham
d769826b0d
[MIPS] Removed the unused header
...
Change-Id: I8756a862669d4e5f283945496983f11a59dea30c
2012-09-24 11:52:00 -07:00
Elliott Hughes
d5c654c053
am 3b6914bf
: Merge "Fix dlsym and dladdr to use load_bias instead of base"
...
* commit '3b6914bf04942f74e9dba43a75d5d5ae94161b95':
Fix dlsym and dladdr to use load_bias instead of base
2012-09-24 10:21:23 -07:00
Elliott Hughes
a9a1d8a5d2
am f4b34b6c
: (-s ours) DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
* commit 'f4b34b6c3942be273ad7298a40be0d312b183aab':
DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
2012-09-24 10:16:43 -07:00
Elliott Hughes
f153ed380d
am f4b34b6c
: DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
* commit 'f4b34b6c3942be273ad7298a40be0d312b183aab':
DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
2012-09-24 10:16:37 -07:00