Nick Kralevich
1268f227ee
am f09bfa3c: am 25482963: am 5fc47aae: Merge "logd: Don\'t embed a flexible array member within another struct"
...
* commit 'f09bfa3c14c8b5a920a98c1327c0d42f9ef9e2ca':
logd: Don't embed a flexible array member within another struct
2015-04-07 18:44:07 +00:00
Nick Kralevich
58ba58a97c
logd: Don't embed a flexible array member within another struct
...
C (but not C++) has a concept of a flexible array member, which
is documented at https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html .
Using a flexible array member indicates that the structure is
really a header for a variable length object.
In logd's case, the variable length structure android_event_string_t
was embedded within another structure called
android_log_event_string_t. This makes gcc's __builtin_object_size()
function really confused. When compiling with C++,
__builtin_object_size(android_log_event_string_t.payload.data, 1)
would return 0, whereas if you compiled the code with C, the same
call would (properly) return -1.
Code which does automatic bounds checking, such as the proposed
patch at https://android-review.googlesource.com/145411 , will
cause problems for logd if this syntax is used.
Don't try to embed a variable length structure within another
structure. This doesn't appear to be valid C nor C++, and
while it's worked, it seems problematic.
Instead, inline the structure so it's one big happy structure.
Change-Id: I8ac02b7142a4f6560f5f80df2effcf720f9896fc
2015-04-07 10:12:20 -07:00
Mark Salyzyn
b885106dc7
am 2904e949: am 0bce68b4: am 33c2ad37: Merge "android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS"
...
* commit '2904e949bb872051618c323c74fcb0e93f67ed09':
android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS
2015-04-06 23:28:48 +00:00
Mark Salyzyn
3fe36779ef
android_filesystem_config: move fs_config to libcutils
...
Bug: 19908228
Change-Id: Id51c0c50eb2677824d052882f4263193a08e1402
2015-04-06 15:04:05 -07:00
Mark Salyzyn
16045614fd
android_filesystem_config.h: use __BEGIN_DECLS and __END_DECLS
...
Change-Id: Idb050b9ef4e7947664295b173e1b09d65accd3e9
2015-04-06 14:15:58 -07:00
Tim Kilbourn
628620c7ba
Allow inputflinger to have CAP_BLOCK_SUSPEND.
...
(Cherry picked from commit 83e6f2606b
2015-04-06 10:57:29 -07:00
Mark Salyzyn
a21c29ee81
android_filesystem_config: move fs_config to libcutils
...
Bug: 19908228
Change-Id: Id51c0c50eb2677824d052882f4263193a08e1402
2015-04-06 10:04:16 -07:00
Rom Lemarchand
f396c9644b
Merge "Move audio includes to system/media/audio"
2015-04-04 01:13:57 +00:00
Rom Lemarchand
be7aca60f3
Move audio includes to system/media/audio
...
Change-Id: I21bed541dbd81127e6b8340f7f14b5523f7c5c0d
2015-04-03 15:12:01 -07:00
Elliott Hughes
3bb04bd804
am 6c7c6d04: am 7c194525: am ea975880: Merge "Only Windows doesn\'t have %zd."
...
* commit '6c7c6d0420ca837b81927b2f7c08cd9d92533043':
Only Windows doesn't have %zd.
2015-04-03 20:58:29 +00:00
Elliott Hughes
7c1945254e
am ea975880: Merge "Only Windows doesn\'t have %zd."
...
* commit 'ea975880112c27293800ede36e0323ff2a7b9322':
Only Windows doesn't have %zd.
2015-04-03 20:30:46 +00:00
Elliott Hughes
146c244613
Only Windows doesn't have %zd.
...
Change-Id: Ie09619df212cf7c8aa18a6d46c3e6b6ca3f478cf
2015-04-03 12:53:36 -07:00
Elliott Hughes
16bcaac5fd
am cd868370: am b2c3473d: am 70df6f85: Merge "Just use snprintf for android_get_control_socket."
...
* commit 'cd8683709c2d1bcac7e3b9de827a2dfc8f24bf09':
Just use snprintf for android_get_control_socket.
2015-04-03 14:53:01 +00:00
Elliott Hughes
bbc6e1bf86
am b4573331: am adc10102: am 4c1d4a0e: Merge "Be more intention-revealing with libcutils\' strlcpy."
...
* commit 'b45733319dc269375d599da894eecd2ffa4211ff':
Be more intention-revealing with libcutils' strlcpy.
2015-04-03 14:52:33 +00:00
Elliott Hughes
b2c3473d35
am 70df6f85: Merge "Just use snprintf for android_get_control_socket."
...
* commit '70df6f85fe8164010be3e4e1cf87e1dd31fb7614':
Just use snprintf for android_get_control_socket.
2015-04-03 03:45:30 +00:00
Elliott Hughes
edc49d7b98
Just use snprintf for android_get_control_socket.
...
Change-Id: I3d0da03847f79c9f9b2cfd7189a07f63b17fc4a2
2015-04-02 17:42:56 -07:00
Elliott Hughes
adc1010249
am 4c1d4a0e: Merge "Be more intention-revealing with libcutils\' strlcpy."
...
* commit '4c1d4a0e8ec344799813ce5e6642946839e0036a':
Be more intention-revealing with libcutils' strlcpy.
2015-04-02 23:54:37 +00:00
Phil Burk
7c6f796df4
Merge "audio.h: add AUDIO_FORMAT_DTS"
2015-04-02 23:10:23 +00:00
Elliott Hughes
2040031f7b
Be more intention-revealing with libcutils' strlcpy.
...
Several people have been independently confused about when this gets
built and why over the past couple of days.
Change-Id: I2d4a02f66e24c0734327585b7d27e50a344b1e94
2015-04-02 15:39:33 -07:00
Elliott Hughes
1c41dadef3
am 797b246f: am a1f69f18: am 21593186: Merge "Move all libcutils tests into the gtests."
...
* commit '797b246ff374e0fc3066a45545b8156f50f23267':
Move all libcutils tests into the gtests.
2015-04-02 22:07:15 +00:00
Elliott Hughes
a1f69f1808
am 21593186: Merge "Move all libcutils tests into the gtests."
...
* commit '2159318647b6032a9d752012b923c579dc1f80da':
Move all libcutils tests into the gtests.
2015-04-02 21:35:18 +00:00
Elliott Hughes
af98efbd15
Move all libcutils tests into the gtests.
...
This also fixes the bug where we were always testing against the fake
strlcpy we provide for glibc/Windows rather than the Android one.
This also removes some unnecessary library dependencies.
This also builds all the cutils tests for the host (static and dynamic).
Change-Id: Icd129d5b025c0ca801be5acf31a54ecd88608df9
2015-04-02 14:25:55 -07:00
Phil Burk
103c2d2203
audio.h: add AUDIO_FORMAT_DTS
...
Bug: 18292317
Change-Id: Icb3855e958d02e3b03517ac0fcf7de743d896c12
Signed-off-by: Phil Burk <philburk@google.com>
2015-04-01 16:54:41 -07:00
Richard Uhler
3f80c4d974
am 88defca0: am b3b1757f: am 0c266ef2: Merge "Define atrace_* functions for both target and host."
...
* commit '88defca0f5ee64143a83021e637b53908ed109ed':
Define atrace_* functions for both target and host.
2015-04-01 18:04:49 +00:00
Richard Uhler
b3b1757fd9
am 0c266ef2: Merge "Define atrace_* functions for both target and host."
...
* commit '0c266ef2d7e137efbd83366a98a861d9770fbf06':
Define atrace_* functions for both target and host.
2015-04-01 17:37:10 +00:00
Richard Uhler
0c266ef2d7
Merge "Define atrace_* functions for both target and host."
2015-04-01 17:29:34 +00:00
Christopher Ferris
7d4347389c
am 22790dfc: am 246e9d50: am 9dc41d5d: Merge "Refactor the code."
...
* commit '22790dfcfceebc537ffd3eb0a15fc0512f036091':
Refactor the code.
2015-03-31 23:01:28 +00:00
Christopher Ferris
246e9d502c
am 9dc41d5d: Merge "Refactor the code."
...
* commit '9dc41d5d34c792e7a05e1ddfeea99c6cfc02fffd':
Refactor the code.
2015-03-31 21:15:52 +00:00
Christopher Ferris
9dc41d5d34
Merge "Refactor the code."
2015-03-31 21:11:36 +00:00
Tim Kilbourn
eeb212df71
Merge "Allow inputflinger to have CAP_BLOCK_SUSPEND."
2015-03-31 20:23:19 +00:00
Yin-Chia Yeh
3fcb735030
Merge "graphics: add android raw12 format"
2015-03-31 18:27:11 +00:00
Christopher Ferris
2c43cff01d
Refactor the code.
...
The object hierarchy was confusing and convoluted. This removes
a lot of unnecessary code, and consolidates the BacktraceCurrent
and BacktraceThread code into BacktraceCurrent.
Change-Id: I01c8407d493712a48169df49dd3ff46db4a7c3ae
2015-03-31 10:51:44 -07:00
Yin-Chia Yeh
9a5eeba588
graphics: add android raw12 format
...
Change-Id: I1c528ecf62746aa96d6e132eaa874015d9d7c446
2015-03-30 16:35:56 -07:00
Tim Kilbourn
02fedb153d
Merge "Use eventfd instead of pipe in Looper."
2015-03-30 17:04:52 +00:00
Elliott Hughes
1ef8498d02
am 4ce3c828: am 0cd316a4: am 5db3936d: Merge "Log more timing information from init."
...
* commit '4ce3c8288ba030c2d2a80cf94ceb5d2f84a66d26':
Log more timing information from init.
2015-03-28 17:10:38 +00:00
Elliott Hughes
0cd316a46b
am 5db3936d: Merge "Log more timing information from init."
...
* commit '5db3936dbe6fa73d45ab0f02b7166f43680084d3':
Log more timing information from init.
2015-03-28 16:50:35 +00:00
Elliott Hughes
da40c00137
Log more timing information from init.
...
Also make important events in init's life NOTICE rather than INFO,
and ensure that NOTICE events actually make it to the kernel log.
Also fix the logging so that if you have a printf format string
error, the compiler now catches it.
Also give messages from init, ueventd, and watchdogd distinct tags.
(Previously they'd all call themselves "init", and dmesg doesn't
include pids, so you couldn't untangle them.)
Also include the tag in SELinux messages.
Bug: 19544788
Change-Id: Ica6daea065bfdb80155c52c0b06f346a7df208fe
2015-03-28 00:25:22 -07:00
Richard Uhler
7d451ab96d
Define atrace_* functions for both target and host.
...
This change defines atrace_* functions for the host that act as
no-ops, which makes it easier to add tracing in ART.
Change-Id: I89397e83986686a2b6a6f245c25017eb379081b1
2015-03-27 14:58:30 -07:00
Tim Kilbourn
8892ce6383
Use eventfd instead of pipe in Looper.
...
Bug: 19933224
Change-Id: I6611e918db960bbb0e74f8308e10bdf79510b899
2015-03-27 09:15:43 -07:00
Dan Albert
ac197dd2af
am 1188a4d8: am a596623f: am 6ccfabcf: Merge "O_CLOEXEC is O_NOINHERIT on Windows."
...
* commit '1188a4d856f6c840a2d39c44e35ba3f3cd86b3a5':
O_CLOEXEC is O_NOINHERIT on Windows.
2015-03-27 06:55:14 +00:00
Dan Albert
a596623fbf
am 6ccfabcf: Merge "O_CLOEXEC is O_NOINHERIT on Windows."
...
* commit '6ccfabcf5d547a04a1e6c5237f20670230a7f6a4':
O_CLOEXEC is O_NOINHERIT on Windows.
2015-03-27 06:34:45 +00:00
Dan Albert
c6b30f376d
O_CLOEXEC is O_NOINHERIT on Windows.
...
Change-Id: I714aa08344fa10684c99651f953834086cc162c7
2015-03-26 23:24:15 -07:00
Tim Kilbourn
83e6f2606b
Allow inputflinger to have CAP_BLOCK_SUSPEND.
...
Change-Id: I817707721786e9b920fef14ebe836fdcd65a8606
2015-03-25 09:25:33 -07:00
Jean-Michel Trivi
187f67695a
Merge "Fix comment in audio definitions header"
2015-03-25 01:14:54 +00:00
Jean-Michel Trivi
1ede5537a3
Fix comment in audio definitions header
...
Change-Id: I08f23f3feaacf4cb39e93992fe839f1c1f084363
2015-03-24 17:17:45 -07:00
Christopher Ferris
ad27dd98ae
am bdabcf4c: am 730d7c53: am 8e1697e7: Merge "Fix mac sdk build."
...
* commit 'bdabcf4c8bd7c9b5b29e2d3af07a5fb0e2733823':
Fix mac sdk build.
2015-03-24 05:20:50 +00:00
Christopher Ferris
730d7c530a
am 8e1697e7: Merge "Fix mac sdk build."
...
* commit '8e1697e7528f88985a5d702af53ef5d446f65fa1':
Fix mac sdk build.
2015-03-24 05:00:51 +00:00
Christopher Ferris
fc3576f675
Fix mac sdk build.
...
Add include files for types and functions that were not included properly.
Change-Id: I4849f5bdf535c6eec9254228cf980c30d11a5a1b
2015-03-23 21:40:30 -07:00
Dan Albert
b3edb9d3a1
am 49da340d: am 4a342186: am 9f8093f8: Merge "Move gettid() into libcutils."
...
* commit '49da340d9ee272ff561b95288e4390d606b22ea9':
Move gettid() into libcutils.
2015-03-24 02:59:21 +00:00
Narayan Kamath
7d1c434e1f
am fb50475b: am a3d3144d: am fd26252d: Merge "Remove libzipfile."
...
* commit 'fb50475b71c34f6dce011d80d704aac99cf6c8ae':
Remove libzipfile.
2015-03-24 01:31:47 +00:00
