Dan Albert
b9122b73bf
am 8a7f8387: Merge "Use snprintf(3) instead of sprintf(3)."
...
* commit '8a7f8387b3b95de2ee0c42e34a226a1fcc066896':
Use snprintf(3) instead of sprintf(3).
2014-10-09 00:40:24 +00:00
Dan Albert
653f30b15a
am 8a7f8387: Merge "Use snprintf(3) instead of sprintf(3)."
...
* commit '8a7f8387b3b95de2ee0c42e34a226a1fcc066896':
Use snprintf(3) instead of sprintf(3).
2014-10-09 00:39:27 +00:00
Dan Albert
8a7f8387b3
Merge "Use snprintf(3) instead of sprintf(3)."
2014-10-09 00:32:11 +00:00
Dan Albert
a2220ffb74
am 72d72d91: Merge "Replace uses of sprintf(3) with snprintf(3)."
...
* commit '72d72d91262fabe6bc169618ef3acb0721441cf0':
Replace uses of sprintf(3) with snprintf(3).
2014-10-09 00:13:06 +00:00
Ying Wang
196f4eee9f
am 0c0e728b: Merge "Build dlext_testzip as custom module."
...
* commit '0c0e728bd8cdeb0e73fd9c491d05993dfc77b622':
Build dlext_testzip as custom module.
2014-10-09 00:13:05 +00:00
Dan Albert
8b3b4fa0ae
am 72d72d91: Merge "Replace uses of sprintf(3) with snprintf(3)."
...
* commit '72d72d91262fabe6bc169618ef3acb0721441cf0':
Replace uses of sprintf(3) with snprintf(3).
2014-10-09 00:12:30 +00:00
Ying Wang
75fd0e76f8
am 0c0e728b: Merge "Build dlext_testzip as custom module."
...
* commit '0c0e728bd8cdeb0e73fd9c491d05993dfc77b622':
Build dlext_testzip as custom module.
2014-10-09 00:12:29 +00:00
Dan Albert
ca75f9cdeb
Use snprintf(3) instead of sprintf(3).
...
This change should probably be made upstream as well, but they have a
note about not using it because it isn't available on all systems.
Change-Id: I6d8404c031bd2f486532ced55d94bbb4a4cd2e71
2014-10-08 17:10:26 -07:00
Dan Albert
72d72d9126
Merge "Replace uses of sprintf(3) with snprintf(3)."
2014-10-08 23:44:48 +00:00
Ying Wang
0c0e728bd8
Merge "Build dlext_testzip as custom module."
2014-10-08 23:43:50 +00:00
Ying Wang
667853d477
Build dlext_testzip as custom module.
...
Use $(BUILD_SYSTEM)/base_rules to build it as custom module, so that
it's exposed to utilities like mm/mmma etc.
Bug: 17887283
Change-Id: Idd7b62d08e4d56331a3ff15da6aa46eae8c41898
2014-10-08 16:38:58 -07:00
Dan Albert
cfd8c45725
Replace uses of sprintf(3) with snprintf(3).
...
At -00, the compiler warns about sprintf(3), and it is promoted to an
error by -Werror.
Change-Id: Ibb380d27d7eb09dda8ac785be2478d656b379190
2014-10-08 16:12:27 -07:00
Dmitriy Ivanov
86c20f6a52
am ac3c94d0: Merge "Fix mma build: \'cd bionic && mma\' case"
...
* commit 'ac3c94d031c16a0299471a593cdc6248494e539d':
Fix mma build: 'cd bionic && mma' case
2014-10-08 22:49:22 +00:00
Elliott Hughes
9a96ca3ec4
am 0511534d: Merge "Don\'t silently return EINVAL for a NULL sem_t*."
...
* commit '0511534dcbb00f26b2fd6209b1b60a3263bf042c':
Don't silently return EINVAL for a NULL sem_t*.
2014-10-08 22:49:21 +00:00
Elliott Hughes
294d7d1215
am bfeef2d3: Merge "Use ln(1) rather than cp(1) to set up host /system for testing."
...
* commit 'bfeef2d3a903f161531ce5e45b2dd7d280e7f154':
Use ln(1) rather than cp(1) to set up host /system for testing.
2014-10-08 22:49:20 +00:00
Dmitriy Ivanov
c4210cea45
am ac3c94d0: Merge "Fix mma build: \'cd bionic && mma\' case"
...
* commit 'ac3c94d031c16a0299471a593cdc6248494e539d':
Fix mma build: 'cd bionic && mma' case
2014-10-08 22:49:08 +00:00
Elliott Hughes
301c452e55
am 0511534d: Merge "Don\'t silently return EINVAL for a NULL sem_t*."
...
* commit '0511534dcbb00f26b2fd6209b1b60a3263bf042c':
Don't silently return EINVAL for a NULL sem_t*.
2014-10-08 22:49:07 +00:00
Elliott Hughes
46b9984155
am bfeef2d3: Merge "Use ln(1) rather than cp(1) to set up host /system for testing."
...
* commit 'bfeef2d3a903f161531ce5e45b2dd7d280e7f154':
Use ln(1) rather than cp(1) to set up host /system for testing.
2014-10-08 22:49:06 +00:00
Dmitriy Ivanov
ac3c94d031
Merge "Fix mma build: 'cd bionic && mma' case"
2014-10-08 22:39:21 +00:00
Dmitriy Ivanov
51166d3aa2
Fix mma build: 'cd bionic && mma' case
...
Bug: 17887283
Change-Id: If2015f2361348eac8c53aed3f8715077b79ce2f5
2014-10-08 15:36:56 -07:00
Elliott Hughes
0511534dcb
Merge "Don't silently return EINVAL for a NULL sem_t*."
2014-10-08 22:21:13 +00:00
Elliott Hughes
bfeef2d3a9
Merge "Use ln(1) rather than cp(1) to set up host /system for testing."
2014-10-08 22:17:19 +00:00
Elliott Hughes
75129ae9f3
Don't silently return EINVAL for a NULL sem_t*.
...
Bug: 17571197
Change-Id: Ied31d8de87fc10d20dc338be0457e9a4ddb9a0a5
2014-10-08 15:11:44 -07:00
Elliott Hughes
3ea4d56ed4
Use ln(1) rather than cp(1) to set up host /system for testing.
...
The trouble with cp is that if you're running a command directly (because
you're using gdb, say), you need to make sure you've copied the linker
and shell again if you've done a rebuild that caused a change there.
Change-Id: I312da30c0f92b515967e854e0faba272c961ecc7
2014-10-08 14:56:27 -07:00
Elliott Hughes
5d104a0454
am 98f32183: am 13641010: Merge "Fix compile-time tests for LP64."
...
* commit '98f321838be54a64c595d65379e3554fa3d6a8d7':
Fix compile-time tests for LP64.
2014-10-08 20:44:45 +00:00
Elliott Hughes
98f321838b
am 13641010: Merge "Fix compile-time tests for LP64."
...
* commit '1364101067072c2ce6fa395cdef2534f338f30b1':
Fix compile-time tests for LP64.
2014-10-08 20:40:08 +00:00
Elliott Hughes
7083b23b1c
am 13641010: Merge "Fix compile-time tests for LP64."
...
* commit '1364101067072c2ce6fa395cdef2534f338f30b1':
Fix compile-time tests for LP64.
2014-10-08 20:39:57 +00:00
Elliott Hughes
1364101067
Merge "Fix compile-time tests for LP64."
2014-10-08 20:31:10 +00:00
Elliott Hughes
b4b15c63a1
Fix compile-time tests for LP64.
...
Change-Id: Ib9bec5c6c77c55679d64c2bc15ab70979c40e66c
2014-10-08 13:21:29 -07:00
Dan Albert
aca5f36de3
am 035c00d0: am 5cc5c5ea: Merge "Add basic compile time tests for sn?printf."
...
* commit '035c00d09ce2b6b04d2c278b8dfadc302acc3de1':
Add basic compile time tests for sn?printf.
2014-10-08 20:17:24 +00:00
Dan Albert
035c00d09c
am 5cc5c5ea: Merge "Add basic compile time tests for sn?printf."
...
* commit '5cc5c5ea0b7a5a2d523ea35c645a42b222929276':
Add basic compile time tests for sn?printf.
2014-10-08 20:13:35 +00:00
Dan Albert
1b06736d96
am 5cc5c5ea: Merge "Add basic compile time tests for sn?printf."
...
* commit '5cc5c5ea0b7a5a2d523ea35c645a42b222929276':
Add basic compile time tests for sn?printf.
2014-10-08 20:13:24 +00:00
Dan Albert
5cc5c5ea0b
Merge "Add basic compile time tests for sn?printf."
2014-10-08 20:04:27 +00:00
Dan Albert
2fbb1b653e
Add basic compile time tests for sn?printf.
...
Bug: 17782583
Change-Id: I6443537c643d1cc6b4a8f2dab5c364f2fbc1faa3
2014-10-08 13:02:53 -07:00
Elliott Hughes
94b0a1f08e
am 3430ec18: am 5a3ca374: Merge "Revert "Work around a bug in Immersion\'s libImmEmulatorJ.so.""
...
* commit '3430ec18a45830cde56393cf67ec34ad4169c9e1':
Revert "Work around a bug in Immersion's libImmEmulatorJ.so."
2014-10-08 16:53:54 +00:00
Elliott Hughes
3430ec18a4
am 5a3ca374: Merge "Revert "Work around a bug in Immersion\'s libImmEmulatorJ.so.""
...
* commit '5a3ca374583f7605672d9e8f9098011de240f7c4':
Revert "Work around a bug in Immersion's libImmEmulatorJ.so."
2014-10-08 16:49:35 +00:00
Elliott Hughes
b559513e08
am 5a3ca374: Merge "Revert "Work around a bug in Immersion\'s libImmEmulatorJ.so.""
...
* commit '5a3ca374583f7605672d9e8f9098011de240f7c4':
Revert "Work around a bug in Immersion's libImmEmulatorJ.so."
2014-10-08 16:49:35 +00:00
Elliott Hughes
5a3ca37458
Merge "Revert "Work around a bug in Immersion's libImmEmulatorJ.so.""
2014-10-08 16:40:58 +00:00
Elliott Hughes
abb31de8f3
am 07b7385f: am e5d4fc39: am 1543fdf6: Work around a bug in Immersion\'s libImmEmulatorJ.so.
...
* commit '07b7385fc08055478cd7ec418cf160fbafae4d59':
Work around a bug in Immersion's libImmEmulatorJ.so.
2014-10-08 07:59:31 +00:00
Dan Albert
1c81bdfd3f
am d084b8d6: resolved conflicts for merge of 55ee845b to lmp-mr1-dev-plus-aosp
...
* commit 'd084b8d6b8c08fb399ba1127063c15a8c970c710':
Inline helpers need to be exported unmangled.
2014-10-08 07:52:09 +00:00
Elliott Hughes
07b7385fc0
am e5d4fc39: am 1543fdf6: Work around a bug in Immersion\'s libImmEmulatorJ.so.
...
* commit 'e5d4fc39e3f26920f3413070d1175a0afd14a66f':
Work around a bug in Immersion's libImmEmulatorJ.so.
2014-10-08 07:51:01 +00:00
Dan Albert
d084b8d6b8
resolved conflicts for merge of 55ee845b to lmp-mr1-dev-plus-aosp
...
Change-Id: I134ec170a5fa1da065256b2da2e9c139db61b030
2014-10-08 00:07:03 -07:00
Elliott Hughes
e5d4fc39e3
am 1543fdf6: Work around a bug in Immersion\'s libImmEmulatorJ.so.
...
* commit '1543fdf616ddebee7819214437527f380e5c743b':
Work around a bug in Immersion's libImmEmulatorJ.so.
2014-10-08 05:24:46 +00:00
Dan Albert
55ee845b8e
Inline helpers need to be exported unmangled.
...
__open_2() is used by the fortify implementation of open(2) in
fcntl.h, and as such needs an unmangled C name. For some reason
(inlining?), this doesn't cause problems at the default optimization
level, but does for -O0.
The rest of these didn't cause build failures, but they look suspect
and probably will, we just haven't caught them yet.
(cherry-pick of 658727e111ed6dee7be5239494f0764f7b1b02f8 with conflicts
in stdio.h and string.h.)
Bug: 17784968
Change-Id: I7391a7a8999ee204eaf6abd14a3d5373ea419d5b
2014-10-07 18:51:24 -07:00
Nick Kralevich
efa8136df9
am 8ec71579: am ce92b41a: cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
...
* commit '8ec715796f3eef76edfe7ae18dc8b8a9e2be4b47':
cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
2014-10-08 00:57:28 +00:00
Nick Kralevich
8ec715796f
am ce92b41a: cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
...
* commit 'ce92b41a00fb86656055eceab9648a858721c3b1':
cdefs.h: add artificial attribute to FORTIFY_SOURCE functions
2014-10-08 00:51:24 +00:00
Dan Albert
f1afba2aca
am 187fd4d7: am c9e4f2de: Merge "Inline helpers need to be exported unmangled."
...
* commit '187fd4d7abd802b77a57e28f3b3c9ce5c3d95e96':
Inline helpers need to be exported unmangled.
2014-10-08 00:16:26 +00:00
Dan Albert
187fd4d7ab
am c9e4f2de: Merge "Inline helpers need to be exported unmangled."
...
* commit 'c9e4f2de0a92ebf6dec336f383ba172efe1bb366':
Inline helpers need to be exported unmangled.
2014-10-08 00:13:09 +00:00
Dan Albert
6c4a64e3e2
am c9e4f2de: Merge "Inline helpers need to be exported unmangled."
...
* commit 'c9e4f2de0a92ebf6dec336f383ba172efe1bb366':
Inline helpers need to be exported unmangled.
2014-10-08 00:12:32 +00:00
Dan Albert
c9e4f2de0a
Merge "Inline helpers need to be exported unmangled."
2014-10-08 00:01:08 +00:00