Dan Albert
2c93697cfc
am c4f8fa7b
: Merge "Link libraries needed for Darwin adb tests."
...
* commit 'c4f8fa7b36a8ba397f1c0ad3c7fb5a5c09520272':
Link libraries needed for Darwin adb tests.
2015-04-17 04:46:48 +00:00
Dan Albert
c4f8fa7b36
Merge "Link libraries needed for Darwin adb tests."
2015-04-17 04:37:41 +00:00
Elliott Hughes
38cb7caf33
am d393e71f
: Merge "Move sysdeps_win32 to C++."
...
* commit 'd393e71f397110ef182708596aaca870141c9978':
Move sysdeps_win32 to C++.
2015-04-17 03:13:31 +00:00
Elliott Hughes
d393e71f39
Merge "Move sysdeps_win32 to C++."
2015-04-17 03:04:43 +00:00
Elliott Hughes
56a78ef26e
am 2cba9405
: Merge "[MIPS] Fast android_memset for Mips64, Mipsr6"
...
* commit '2cba9405f94f94a8fc50b351393b6e1d71d97712':
[MIPS] Fast android_memset for Mips64, Mipsr6
2015-04-17 02:17:44 +00:00
Dan Albert
f8d6b9b1ef
Link libraries needed for Darwin adb tests.
...
Change-Id: I1c3c3a7bbd3824f5f3a37ee80c24d1c2a9b98748
2015-04-16 19:13:58 -07:00
Elliott Hughes
2cba9405f9
Merge "[MIPS] Fast android_memset for Mips64, Mipsr6"
2015-04-17 02:07:32 +00:00
Duane Sand
1ef9ccd772
[MIPS] Fast android_memset for Mips64, Mipsr6
...
Fix broken mips64 build by replacing mips32r2-only android_memset.S.
Use HW-bonded pairs of 64-bit stores to fill 128 bits/cycle.
Rely on HW automatic cache prefetch optimizations.
Software cache prefetching is counterproductive on next mips cores.
New method is coded in C, and also works okay on non-Mips architectures.
Change-Id: Id7153a8fe11538fe25287e101375661b0e99e2a2
2015-04-16 18:26:22 -07:00
Elliott Hughes
a2f2e56796
Move sysdeps_win32 to C++.
...
Change-Id: I27ca41b64d62bb3611b3a39a5c3bb4377d0773bc
2015-04-16 16:47:02 -07:00
Elliott Hughes
54de3e91df
am 34d68c2b
: Merge "Switch usb_linux_client to C++."
...
* commit '34d68c2b574a21917d9e8d69a24ab863cc9f6910':
Switch usb_linux_client to C++.
2015-04-16 21:50:57 +00:00
Greg Hackmann
ec682735c5
am 0e2d6015
: Merge "Revert "cutils: add OS-independent endian.h""
...
* commit '0e2d6015bcd86f99b94dc13d8bfc996897f05b98':
Revert "cutils: add OS-independent endian.h"
2015-04-16 21:39:44 +00:00
Elliott Hughes
34d68c2b57
Merge "Switch usb_linux_client to C++."
2015-04-16 21:39:31 +00:00
Elliott Hughes
2acec9153e
Switch usb_linux_client to C++.
...
Change-Id: I8172e81e6c4665aa16e9e8e0c33b048dbb9ad848
2015-04-16 14:38:37 -07:00
Greg Hackmann
0e2d6015bc
Merge "Revert "cutils: add OS-independent endian.h""
2015-04-16 21:29:44 +00:00
Greg Hackmann
bf7f28a415
Revert "cutils: add OS-independent endian.h"
...
This reverts commit c3bac8b671
.
2015-04-16 14:28:58 -07:00
Elliott Hughes
d65748bfce
am 55f6bbf0
: Merge "Move get_my_path_darwin to C++."
...
* commit '55f6bbf06ade70f7b7ac9aaf4b51b2fcfa7d8368':
Move get_my_path_darwin to C++.
2015-04-16 20:37:44 +00:00
Elliott Hughes
55f6bbf06a
Merge "Move get_my_path_darwin to C++."
2015-04-16 20:31:25 +00:00
Elliott Hughes
1a4d85a5e8
Move get_my_path_darwin to C++.
...
As long as we have C in here, we can't use C++ in our headers.
Change-Id: Ibccaa77a5af506dc504aa9c39c8dca5dcdbeccab
2015-04-16 13:24:58 -07: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
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
Yabin Cui
a8ac32c781
Move trace.h to stdatomic.
...
Bug: 20262261
Change-Id: Idaf984786804eb76c285f38b11abbbc0d3706509
2015-04-16 10:41:16 -07: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
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
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
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
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
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
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
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
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