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
Elliott Hughes
f4b34b6c39
DO NOT MERGE Revert "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
This reverts commit 3a936a4980
.
We don't want this in jb-mr1.
2012-09-24 10:13:12 -07:00
The Android Open Source Project
51d270af6d
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I933866be4d956f18dff51676c8027f807cea26d7
2012-09-24 10:11:18 -07:00
Elliott Hughes
3b6914bf04
Merge "Fix dlsym and dladdr to use load_bias instead of base"
2012-09-24 10:03:51 -07:00
Elliott Hughes
82ec685054
am 6c0e373d
: am ec432608
: am 0c24effd
: Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
* commit '6c0e373d38a9cb424bd6d9c4d5d6168960846aa5':
Add the libcutils localtime_tz and mktime_t extensions to bionic.
2012-09-24 09:47:01 -07:00
Elliott Hughes
6da07f02bd
am ecf67e15
: am 2d51dddf
: am 85049ead
: Merge "Use hidden visibility for several internal-use-only functions."
...
* commit 'ecf67e152aecb67bff950d72582ef54b56191096':
Use hidden visibility for several internal-use-only functions.
2012-09-24 09:46:47 -07:00
Elliott Hughes
0349e3d3ff
am d2eea0e6
: am baa74eff
: am 882c6af9
: Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro."
...
* commit 'd2eea0e6d6d4e7c406b06d90316713482d650290':
[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro.
2012-09-24 09:46:46 -07:00
Elliott Hughes
6c0e373d38
am ec432608
: am 0c24effd
: Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
* commit 'ec4326084ed2a717b3e318f36c2675ef033c30ff':
Add the libcutils localtime_tz and mktime_t extensions to bionic.
2012-09-24 09:40:18 -07:00
Naseer Ahmed
21e0a7ee8b
am f7070074
: bionic: Update MDP header for sync
...
* commit 'f707007435ee4798815bd507d86b1460204cfc4f':
bionic: Update MDP header for sync
2012-09-24 09:26:33 -07:00
Elliott Hughes
ec4326084e
am 0c24effd
: Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
...
* commit '0c24effd01736e533fd082b2cf1de8926b0fe880':
Add the libcutils localtime_tz and mktime_t extensions to bionic.
2012-09-24 08:55:27 -07:00
Elliott Hughes
ecf67e152a
am 2d51dddf
: am 85049ead
: Merge "Use hidden visibility for several internal-use-only functions."
...
* commit '2d51dddf1a649c73f207ecf48d419fea8a8ed4de':
Use hidden visibility for several internal-use-only functions.
2012-09-24 08:52:15 -07:00
Elliott Hughes
d2eea0e6d6
am baa74eff
: am 882c6af9
: Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro."
...
* commit 'baa74eff0dd56b1dbf8e8a233a82e6382828ad72':
[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro.
2012-09-24 08:52:14 -07:00
Elliott Hughes
2d51dddf1a
am 85049ead
: Merge "Use hidden visibility for several internal-use-only functions."
...
* commit '85049ead251b0af9411ada3ad1db0f6b75f8e4a8':
Use hidden visibility for several internal-use-only functions.
2012-09-24 08:43:45 -07:00
Elliott Hughes
baa74eff0d
am 882c6af9
: Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro."
...
* commit '882c6af953e5b3fd4b9f4fe74a68128ea16fba3b':
[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro.
2012-09-24 08:43:44 -07:00
Elliott Hughes
0c24effd01
Merge "Add the libcutils localtime_tz and mktime_t extensions to bionic."
2012-09-24 08:41:55 -07:00
Elliott Hughes
85049ead25
Merge "Use hidden visibility for several internal-use-only functions."
2012-09-23 11:08:19 -07:00
The Android Automerger
cc95d69c25
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-22 09:41:22 -07:00
Elliott Hughes
95a7a64ac8
Use hidden visibility for several internal-use-only functions.
...
Change-Id: Ibeea6963ff0cc06479d0a3ed7e868eeece8c55a0
2012-09-21 18:27:40 -07:00
Elliott Hughes
882c6af953
Merge "[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS. Some of the required structure definitons are defined under this macro."
2012-09-21 18:20:03 -07:00
Raghu Gandham
988ff8ff9f
[MIPS] Add CONFIG_32BIT to kernel_default_arch_macros for MIPS.
...
Some of the required structure definitons are defined under this macro.
Change-Id: I7a9a986e371381697dcb56bd8ea362856ffa7509
2012-09-21 17:14:05 -07:00
Raghu Gandham
c1993cac40
Fix dlsym and dladdr to use load_bias instead of base
...
Change-Id: If0f9aa944ccb1f90451aa6674428e34494331d2d
2012-09-21 17:00:30 -07:00
The Android Automerger
e0a00a8a2c
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-21 06:59:14 -07:00
Naseer Ahmed
f707007435
bionic: Update MDP header for sync
...
Change-Id: I5e13cdc9132fd99b8072b2e0836b9a92bc54f9c3
2012-09-20 18:29:45 -07:00
Rebecca Schultz Zavin
27cfd6afd4
am a9dca773
: Update ion header to add FLAG_CACHED_NEEDS_SYNC
...
* commit 'a9dca77315b85f61e7386ca8dc931f79f6396531':
Update ion header to add FLAG_CACHED_NEEDS_SYNC
2012-09-20 14:00:15 -07:00
The Android Open Source Project
0a6cbb97a8
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I487c32c629ef85a9aea22fb7564fd868618f56c3
2012-09-20 10:34:47 -07:00
Rebecca Schultz Zavin
a9dca77315
Update ion header to add FLAG_CACHED_NEEDS_SYNC
...
Bug: 6854979
Change-Id: Ic94c1b7b10ab750a6b4b0db83d2fb1fa073d91b9
Signed-off-by: Rebecca Schultz Zavin <rebecca@android.com>
2012-09-20 09:47:37 -07:00
The Android Automerger
8ab03a28d0
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-19 07:01:27 -07:00
Iliyan Malchev
e55218223b
am 4430aa6a
: Merge "Update headers for Adreno graphics driver" into jb-mr1-dev
...
* commit '4430aa6aaaa8e93bb7fbca761bf18540a7d95ca0':
Update headers for Adreno graphics driver
2012-09-18 20:30:06 -07:00
Iliyan Malchev
4430aa6aaa
Merge "Update headers for Adreno graphics driver" into jb-mr1-dev
2012-09-18 20:27:34 -07:00