Elliott Hughes
96b8b3f5b1
am 4048e091: am 710fd65e: Merge "Don\'t try to read /system/default.prop."
...
* commit '4048e0911244304e0d31cbc66531c26e99ee7752':
Don't try to read /system/default.prop.
2015-04-16 20:13:37 +00:00
Greg Hackmann
47578c6852
am 88e03449: Merge "cutils: add OS-independent endian.h"
...
* commit '88e03449de787bfea2c022d9eac231854c542fa7':
cutils: add OS-independent endian.h
2015-04-16 20:13:19 +00:00
Greg Hackmann
88e03449de
Merge "cutils: add OS-independent endian.h"
2015-04-16 20:06:40 +00:00
Elliott Hughes
4048e09112
am 710fd65e: Merge "Don\'t try to read /system/default.prop."
...
* commit '710fd65e5ff42780ac5b84b17153d57a81105a20':
Don't try to read /system/default.prop.
2015-04-16 20:03:32 +00:00
Elliott Hughes
710fd65e5f
Merge "Don't try to read /system/default.prop."
2015-04-16 19:57:35 +00:00
Yabin Cui
0801196c09
am 5808b357: am 972a8de7: am 51e32b52: Merge "Move trace.h to stdatomic."
...
* commit '5808b3578aa871f7cf4eac3dda93604f9a014e50':
Move trace.h to stdatomic.
2015-04-16 19:19:02 +00:00
Mark Salyzyn
3d6b8c7b58
am 1b2715d9: am 91a4aa0f: am bb643ccb: Merge "logd: propagate ::log status"
...
* commit '1b2715d9f4e47381433efc25d71579a1fa4cba0b':
logd: propagate ::log status
2015-04-16 19:07:17 +00:00
Yabin Cui
5808b3578a
am 972a8de7: am 51e32b52: Merge "Move trace.h to stdatomic."
...
* commit '972a8de7a4fa8f05849dbecde8d700a8522c5b3d':
Move trace.h to stdatomic.
2015-04-16 18:56:17 +00:00
Mark Salyzyn
1b2715d9f4
am 91a4aa0f: am bb643ccb: Merge "logd: propagate ::log status"
...
* commit '91a4aa0f057f882263522fb1c6c04b1413666cea':
logd: propagate ::log status
2015-04-16 18:44:48 +00:00
Yabin Cui
972a8de7a4
am 51e32b52: Merge "Move trace.h to stdatomic."
...
* commit '51e32b52a3d087aec0e80df93129d598221bf312':
Move trace.h to stdatomic.
2015-04-16 18:44:44 +00:00
Yabin Cui
51e32b52a3
Merge "Move trace.h to stdatomic."
2015-04-16 18:35:43 +00:00
Mark Salyzyn
91a4aa0f05
am bb643ccb: Merge "logd: propagate ::log status"
...
* commit 'bb643ccb5d6b1f9a7809e9def30a498b42bd9ed0':
logd: propagate ::log status
2015-04-16 18:33:40 +00:00
Mark Salyzyn
bb643ccb5d
Merge "logd: propagate ::log status"
2015-04-16 18:22:58 +00:00
Greg Hackmann
c3bac8b671
cutils: add OS-independent endian.h
...
cutils/endian.h provides the helpers defined in endian(3), either by
pulling in the OS's built-in endian.h (where available) or recreating
them using GCC builtins.
Change-Id: Ic8965f67e1efdc03f884dbe6b7fe0276f840e4fc
Signed-off-by: Greg Hackmann <ghackmann@google.com>
2015-04-16 11:12:02 -07:00
Mark Salyzyn
3933b9c0ec
am a948e644: am 00712bec: am 96647a68: Merge "libcutils: fs_config must use O_BINARY"
...
* commit 'a948e644f89e49c505f4d8bf13c70e49ba6cc56a':
libcutils: fs_config must use O_BINARY
2015-04-16 17:42:04 +00:00
Yabin Cui
a8ac32c781
Move trace.h to stdatomic.
...
Bug: 20262261
Change-Id: Idaf984786804eb76c285f38b11abbbc0d3706509
2015-04-16 10:41:16 -07:00
Mark Salyzyn
a948e644f8
am 00712bec: am 96647a68: Merge "libcutils: fs_config must use O_BINARY"
...
* commit '00712bec3055464f67633aaefd56e66894f56152':
libcutils: fs_config must use O_BINARY
2015-04-16 17:24:54 +00:00
Mark Salyzyn
00712bec30
am 96647a68: Merge "libcutils: fs_config must use O_BINARY"
...
* commit '96647a688011da6f1bd94a6e5d12202aa5675446':
libcutils: fs_config must use O_BINARY
2015-04-16 17:13:28 +00:00
Mark Salyzyn
96647a6880
Merge "libcutils: fs_config must use O_BINARY"
2015-04-16 17:05:35 +00:00
Mark Salyzyn
c1854f859f
am b522d45b: am 964e1961: am 93e16dca: Merge "libcutils: fs_config: winsdk_tools build fix"
...
* commit 'b522d45b96a84de1e5e5ff1fe7740c3732935ed6':
libcutils: fs_config: winsdk_tools build fix
2015-04-16 16:19:09 +00:00
Mark Salyzyn
b522d45b96
am 964e1961: am 93e16dca: Merge "libcutils: fs_config: winsdk_tools build fix"
...
* commit '964e19616b76112c853d2b59d5769edc9a4b9602':
libcutils: fs_config: winsdk_tools build fix
2015-04-16 15:56:49 +00:00
Mark Salyzyn
964e19616b
am 93e16dca: Merge "libcutils: fs_config: winsdk_tools build fix"
...
* commit '93e16dca64443aab69d3007e29f69e93850c7427':
libcutils: fs_config: winsdk_tools build fix
2015-04-16 15:46:07 +00:00
Mark Salyzyn
4232b378e7
libcutils: fs_config must use O_BINARY
...
Bug: 19908228
Change-Id: I3273cf99b320941f9530a015c9e582af72469acb
2015-04-16 08:44:33 -07:00
Mark Salyzyn
93e16dca64
Merge "libcutils: fs_config: winsdk_tools build fix"
2015-04-16 15:36:28 +00:00
Mark Salyzyn
fd5b425b6e
libcutils: fs_config: winsdk_tools build fix
...
Bug: 19908228
Change-Id: Ia725d20ca4f8a87deec63b6c661f6a09c8671231
2015-04-16 08:32:25 -07:00
Mark Salyzyn
61442e177d
am b3d527b2: am 6e12a78c: am c47b0d52: Merge "libcutils: drop use of mmap"
...
* commit 'b3d527b2cd50c077cda482e60b2c14f864a16a08':
libcutils: drop use of mmap
2015-04-16 03:17:37 +00:00
Mark Salyzyn
b3d527b2cd
am 6e12a78c: am c47b0d52: Merge "libcutils: drop use of mmap"
...
* commit '6e12a78cfd156bcb7b0a09df3d08d59639a85405':
libcutils: drop use of mmap
2015-04-16 02:54:52 +00:00
Mark Salyzyn
6e12a78cfd
am c47b0d52: Merge "libcutils: drop use of mmap"
...
* commit 'c47b0d5278fc403e6a30ea6f4225699b16613879':
libcutils: drop use of mmap
2015-04-16 02:44:41 +00:00
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