Mark Salyzyn
202e153f94
logd: propagate ::log status
...
Add a return value for the ::log() methods, this allows
us to optimize the wakeup for the readers to only occur
when the log message is actually placed.
This is for a future where we may dedupe identical log
messages, filter out log messages, and certainly if we
filter the messages out with an internal logd check of
__android_log_is_loggable().
Change-Id: I763b2a7c29502ab7fa0a5d5022c7b60244fcfde4
2015-04-15 19:43:28 -07:00
Vinit Deshpande
99031d64bb
Merge "am b4ef85c..b4ef85c from mirror-m-wireless-internal-release"
2015-04-16 02:36:44 +00:00
Mark Salyzyn
c47b0d5278
Merge "libcutils: drop use of mmap"
2015-04-16 02:35:10 +00:00
Mark Salyzyn
7977cc63b1
libcutils: drop use of mmap
...
- Causes a build break for MAC and Windows
Bug: 19908228
Change-Id: I9d69967aa988c9ca202805593fa846cb670101cf
2015-04-15 19:28:36 -07:00
Colin Cross
da1fca90cf
am 9bca77b7: am fcea2dd3: am d4dc1951: Merge "libsparse: move_chunks_up_to_len() does not account skip chunks"
...
* commit '9bca77b7c04055f6f73a193ae407d158b3eb9725':
libsparse: move_chunks_up_to_len() does not account skip chunks
2015-04-16 00:43:43 +00:00
Mark Salyzyn
233b4974df
am c130d96e: am e1b87e1a: am 48257704: Merge "libcutils: add fs_config_generate"
...
* commit 'c130d96e9cf786d17196a400a07fb4e6e221a07c':
libcutils: add fs_config_generate
2015-04-16 00:32:33 +00:00
Mark Salyzyn
eb24a1c288
am a134c414: am 2eeda522: am 0a9f6c8c: Merge "libcutils: fs_config read from file"
...
* commit 'a134c4145b15bc459736f4935600560fccb291fa':
libcutils: fs_config read from file
2015-04-16 00:32:31 +00:00
Colin Cross
9bca77b7c0
am fcea2dd3: am d4dc1951: Merge "libsparse: move_chunks_up_to_len() does not account skip chunks"
...
* commit 'fcea2dd37931c98f29fd084e03bfce0563418b04':
libsparse: move_chunks_up_to_len() does not account skip chunks
2015-04-16 00:25:36 +00:00
Colin Cross
fcea2dd379
am d4dc1951: Merge "libsparse: move_chunks_up_to_len() does not account skip chunks"
...
* commit 'd4dc1951e6b475d7fddb840f1d867a5b5499175b':
libsparse: move_chunks_up_to_len() does not account skip chunks
2015-04-16 00:11:07 +00:00
Mark Salyzyn
c130d96e9c
am e1b87e1a: am 48257704: Merge "libcutils: add fs_config_generate"
...
* commit 'e1b87e1a0ee5d9b774fde68df8593b2fdeca4bb2':
libcutils: add fs_config_generate
2015-04-16 00:10:35 +00:00
Mark Salyzyn
a134c4145b
am 2eeda522: am 0a9f6c8c: Merge "libcutils: fs_config read from file"
...
* commit '2eeda52271b065542e40d8c8287758bf452ba873':
libcutils: fs_config read from file
2015-04-16 00:10:34 +00:00
Elliott Hughes
95f709a9f5
Don't try to read /system/default.prop.
...
It doesn't exist. We use /system/build.prop.
Change-Id: Ie635f9b3cc65de807f128339199b853db5a8eb2f
2015-04-15 17:05:23 -07:00
Colin Cross
d4dc1951e6
Merge "libsparse: move_chunks_up_to_len() does not account skip chunks"
2015-04-16 00:04:41 +00:00
Mark Salyzyn
e1b87e1a0e
am 48257704: Merge "libcutils: add fs_config_generate"
...
* commit '48257704b9c432c00d3383eb4f920f92a75485ed':
libcutils: add fs_config_generate
2015-04-15 23:59:51 +00:00
Mark Salyzyn
2eeda52271
am 0a9f6c8c: Merge "libcutils: fs_config read from file"
...
* commit '0a9f6c8c65aa5fc30a21900966108ebab8431845':
libcutils: fs_config read from file
2015-04-15 23:59:50 +00:00
Mark Salyzyn
48257704b9
Merge "libcutils: add fs_config_generate"
2015-04-15 23:50:23 +00:00
Christopher Ferris
caabf087ff
am e4c4d7ec: am 2af4186c: am 5865da7b: Merge "Remove libunwind-ptrace dependency."
...
* commit 'e4c4d7ecd666d473251866926823d2cc9c7f0ab2':
Remove libunwind-ptrace dependency.
2015-04-15 23:49:44 +00:00
Mark Salyzyn
0a9f6c8c65
Merge "libcutils: fs_config read from file"
2015-04-15 23:49:11 +00:00
Mark Salyzyn
5d9e5efbcd
libcutils: add fs_config_generate
...
Bug: 19908228
Change-Id: Icb0e189a86758bb779b9bdf7c0d92216d297869f
2015-04-15 16:43:07 -07:00
Mark Salyzyn
68651148dd
libcutils: fs_config read from file
...
Intention is to read from ${OUT}/system/etc/fs_config_dirs and
${OUT}/system/etc/fs_config_files on host. And
/system/etc/fs_config_dirs and /system/etc/config_files
on target systems.
Bug: 19908228
Change-Id: Ieaedd99e88c7f7f717878d9344c387ddf335ccbb
2015-04-15 16:43:01 -07:00
Christopher Ferris
e4c4d7ecd6
am 2af4186c: am 5865da7b: Merge "Remove libunwind-ptrace dependency."
...
* commit '2af4186c4d832336417354b3b3e1114af20a2645':
Remove libunwind-ptrace dependency.
2015-04-15 23:26:03 +00:00
Mark Salyzyn
c22c2470df
am 852bb213: am 8c9f052a: am a791ec8a: Merge "Revert "libcutils: fs_config read from file""
...
* commit '852bb213c3a9db16cdec4e36d529fa8f63f25dec':
Revert "libcutils: fs_config read from file"
2015-04-15 23:15:06 +00:00
Christopher Ferris
2af4186c4d
am 5865da7b: Merge "Remove libunwind-ptrace dependency."
...
* commit '5865da7b5b93dbab86f120892ee70990bddf9608':
Remove libunwind-ptrace dependency.
2015-04-15 23:14:43 +00:00
Christopher Ferris
5865da7b5b
Merge "Remove libunwind-ptrace dependency."
2015-04-15 23:03:31 +00:00
Mark Salyzyn
852bb213c3
am 8c9f052a: am a791ec8a: Merge "Revert "libcutils: fs_config read from file""
...
* commit '8c9f052a77a21c7d771277e88edb0bd64eae9890':
Revert "libcutils: fs_config read from file"
2015-04-15 22:49:59 +00:00
Mark Salyzyn
8c9f052a77
am a791ec8a: Merge "Revert "libcutils: fs_config read from file""
...
* commit 'a791ec8ad15630978ce072f619c47515b3fd70ac':
Revert "libcutils: fs_config read from file"
2015-04-15 22:43:06 +00:00
Mark Salyzyn
a791ec8ad1
Merge "Revert "libcutils: fs_config read from file""
2015-04-15 22:31:26 +00:00
Mark Salyzyn
7e82633106
Revert "libcutils: fs_config read from file"
...
There is no endian.h on windows
This reverts commit 4e5f71ae72
.
Change-Id: I6aedf35ed319c7f8febc7ab98e104a625fb27f69
2015-04-15 22:30:30 +00:00
Christopher Ferris
3b9d14ac4b
Remove libunwind-ptrace dependency.
...
Change-Id: Iae4a73546f672c208ffe1b224e8d9a9e693f95f0
2015-04-15 14:50:39 -07:00
Mark Salyzyn
7e64bbf3a2
am 440dffa2: am 6a6844c7: am 89e2f942: Merge "libcutils: fs_config read from file"
...
* commit '440dffa252cb05505984c16d8d5d4c6f6228e332':
libcutils: fs_config read from file
2015-04-15 21:47:02 +00:00
Mark Salyzyn
440dffa252
am 6a6844c7: am 89e2f942: Merge "libcutils: fs_config read from file"
...
* commit '6a6844c7b518a40985a3c13d2c986589b5ff4fd2':
libcutils: fs_config read from file
2015-04-15 21:25:57 +00:00
Mark Salyzyn
6a6844c7b5
am 89e2f942: Merge "libcutils: fs_config read from file"
...
* commit '89e2f942181feab45e7dab5b6d3183da0475a295':
libcutils: fs_config read from file
2015-04-15 21:19:47 +00:00
Mark Salyzyn
89e2f94218
Merge "libcutils: fs_config read from file"
2015-04-15 21:09:26 +00:00
Dan Stoza
3c4074bfb4
am a197c3b7: am 3ec9c17f: am 04274a29: Merge "Add NATIVE_WINDOW_SET_SURFACE_DAMAGE"
...
* commit 'a197c3b74b50bbdf88a9214269e29db7286338c1':
Add NATIVE_WINDOW_SET_SURFACE_DAMAGE
2015-04-15 20:29:57 +00:00
Dan Stoza
a197c3b74b
am 3ec9c17f: am 04274a29: Merge "Add NATIVE_WINDOW_SET_SURFACE_DAMAGE"
...
* commit '3ec9c17fb6e232ddc78521fdd305e0897230ac1d':
Add NATIVE_WINDOW_SET_SURFACE_DAMAGE
2015-04-15 20:12:17 +00:00
Dan Stoza
3ec9c17fb6
am 04274a29: Merge "Add NATIVE_WINDOW_SET_SURFACE_DAMAGE"
...
* commit '04274a29ff534000ca38cdb627daab98cfa2878d':
Add NATIVE_WINDOW_SET_SURFACE_DAMAGE
2015-04-15 20:01:03 +00:00
Dan Stoza
04274a29ff
Merge "Add NATIVE_WINDOW_SET_SURFACE_DAMAGE"
2015-04-15 19:55:13 +00:00
Dan Stoza
238ec985f9
Add NATIVE_WINDOW_SET_SURFACE_DAMAGE
...
Adds a new perform action: NATIVE_SET_WINDOW_SURFACE_DAMAGE, which
allows the producer to describe the region of the surface that has
changed since the previous frame.
Bug: 11239309
Change-Id: Ie645e6a52b37b5c1b3be19481e8348570d1aa62c
2015-04-15 12:49:41 -07:00
Mark Salyzyn
d54e29b625
am ce70d556: am 961b215c: am c01445d2: Merge "makebootfs: use libcutils shared libraries"
...
* commit 'ce70d556e05281d3567651cf529137ff38c244b1':
makebootfs: use libcutils shared libraries
2015-04-15 19:22:43 +00:00
Elliott Hughes
bbc7ca24da
resolved conflicts for merge of 6e9b28b2
to master
...
Change-Id: Icd1bbc33283c504691934256a4cf5989868d3caf
2015-04-15 12:15:00 -07:00
Mark Salyzyn
ce70d556e0
am 961b215c: am c01445d2: Merge "makebootfs: use libcutils shared libraries"
...
* commit '961b215c41576424cdc8cfe0d5aa5e1db90c226c':
makebootfs: use libcutils shared libraries
2015-04-15 18:37:11 +00:00
Mark Salyzyn
4e5f71ae72
libcutils: fs_config read from file
...
Intention is to read from ${OUT}/system/etc/fs_config_dirs and
${OUT}/system/etc/fs_config_files on host. And
/system/etc/fs_config_dirs and /system/etc/config_files
on target systems.
Bug: 19908228
Change-Id: I0966a94f79a3fae4f7325056c701ea355370f9df
2015-04-15 11:22:52 -07:00
Mark Salyzyn
961b215c41
am c01445d2: Merge "makebootfs: use libcutils shared libraries"
...
* commit 'c01445d2e8faafdb40e4fb426bc537f4f1220bad':
makebootfs: use libcutils shared libraries
2015-04-15 18:22:38 +00:00
Elliott Hughes
6e9b28b2ea
am fae77740: am f65d9756: Merge "Move away from gr_surface."
...
* commit 'fae77740c29b732e82b73a043f596470cd0ac0ed':
Move away from gr_surface.
2015-04-15 18:22:25 +00:00
Mark Salyzyn
c01445d2e8
Merge "makebootfs: use libcutils shared libraries"
2015-04-15 18:14:19 +00:00
Elliott Hughes
fae77740c2
am f65d9756: Merge "Move away from gr_surface."
...
* commit 'f65d97567c0d857458a1978085af4518750f51b6':
Move away from gr_surface.
2015-04-15 18:10:08 +00:00
Elliott Hughes
f65d97567c
Merge "Move away from gr_surface."
2015-04-15 18:02:06 +00:00
Mark Salyzyn
bc7828eb42
makebootfs: use libcutils shared libraries
...
- move to libcutils.so as shared now that they are
in DISTTOOL.
- liblog dependency is part of libcutils, and need not be
called out explicitly now. liblog is in DISTTOOL.
- libcutils fs_config has the right to add Android logging
Bug: 19908228
Change-Id: I915503f64389b59075620578601f98fc0756bd7a
2015-04-15 10:32:19 -07:00
Elliott Hughes
9e85ea1403
Move away from gr_surface.
...
Change-Id: Icfa81b18e5c99e3ffc5c55aba1d435eb26eb8680
2015-04-15 10:25:55 -07:00
Mark Salyzyn
f7842079cd
am 687dae83: am 437a328a: am 56c6575d: Merge "logd: syscall optimization"
...
* commit '687dae83da7da2a0efe8263281f9ba898a610a41':
logd: syscall optimization
2015-04-15 15:28:41 +00:00