mtezych
2a75fa607a
Merge "libsync: Replace inserting tuple into unordered_map in favour of pair." am: 0617179c8c
...
am: 32b3c649f5
2017-01-31 01:21:42 +00:00
mtezych
898f852d38
libsync: Replace inserting tuple into unordered_map in favour of pair. am: 380b2f4fea
...
am: 3500cee3e1
2017-01-31 01:21:31 +00:00
mtezych
32b3c649f5
Merge "libsync: Replace inserting tuple into unordered_map in favour of pair."
...
am: 0617179c8c
2017-01-31 01:18:42 +00:00
mtezych
3500cee3e1
libsync: Replace inserting tuple into unordered_map in favour of pair.
...
am: 380b2f4fea
2017-01-31 01:17:12 +00:00
Treehugger Robot
0617179c8c
Merge "libsync: Replace inserting tuple into unordered_map in favour of pair."
2017-01-31 01:14:15 +00:00
Mark Salyzyn
f598640e48
Merge "Revert "Continue using the legacy NDK android/log.h."" am: 33aa9fc0e1
...
am: cb29e6e94f
2017-01-31 00:20:28 +00:00
Mark Salyzyn
cb29e6e94f
Merge "Revert "Continue using the legacy NDK android/log.h.""
...
am: 33aa9fc0e1
2017-01-31 00:17:29 +00:00
Treehugger Robot
33aa9fc0e1
Merge "Revert "Continue using the legacy NDK android/log.h.""
2017-01-31 00:13:28 +00:00
Christopher Ferris
741308d0f6
Merge "Do not build any host targets on mac." am: a6c62f6832
...
am: f2950bd60f
2017-01-30 23:40:57 +00:00
mtezych
380b2f4fea
libsync: Replace inserting tuple into unordered_map in favour of pair.
...
Inserting tuple into unordered_map relies on non standard libc++ extension:
http://stackoverflow.com/a/21313229
This change removes this dependency.
Test: sync-unit-tests (on hikey with SW_SYNC_USER built into kernel)
2017-01-30 23:39:03 +00:00
Christopher Ferris
f2950bd60f
Merge "Do not build any host targets on mac."
...
am: a6c62f6832
2017-01-30 23:38:26 +00:00
Treehugger Robot
a6c62f6832
Merge "Do not build any host targets on mac."
2017-01-30 23:34:03 +00:00
Mark Salyzyn
bdac221cc3
Revert "Continue using the legacy NDK android/log.h."
...
Use refreshed android/log.h for NDK
This effectively a modern revert of the commit
b7c3996f7c
2017-01-30 22:14:59 +00:00
Christopher Ferris
01d50374ad
Do not build any host targets on mac.
...
Bug: 23762183
Test: Compiled.
Change-Id: I42afabeb7d3576ea4afd4af05bb1cabd79ac76e5
2017-01-30 13:45:16 -08:00
Christopher Ferris
fe71a826f1
Merge "Remote reference to log/logger.h" am: a5cfc8b1e6
...
am: 7ac7dd82dc
2017-01-30 21:39:18 +00:00
Christopher Ferris
7ac7dd82dc
Merge "Remote reference to log/logger.h"
...
am: a5cfc8b1e6
2017-01-30 21:36:49 +00:00
Christopher Ferris
a5cfc8b1e6
Merge "Remote reference to log/logger.h"
2017-01-30 21:32:17 +00:00
Christopher Ferris
71a2dcfc64
Remote reference to log/logger.h
...
It was made an error to include this file after I went through the
presubmit checks.
Test: Compiles.
Change-Id: If00b0b644ecef95325636cec094cfcb399e307f9
2017-01-30 13:24:51 -08:00
Christopher Ferris
dc33c4723a
Merge "New version of unwinder." am: e69b1b9831
...
am: 46895b8af7
2017-01-30 21:08:47 +00:00
Christopher Ferris
46895b8af7
Merge "New version of unwinder."
...
am: e69b1b9831
2017-01-30 21:06:16 +00:00
Christopher Ferris
e69b1b9831
Merge "New version of unwinder."
2017-01-30 21:01:56 +00:00
Sandeep Patil
3a78d95755
Merge "init: split property context into platform & non-platform components" am: d04b1ac006
...
am: b6aa686c71
2017-01-30 19:29:04 +00:00
Sandeep Patil
b6aa686c71
Merge "init: split property context into platform & non-platform components"
...
am: d04b1ac006
2017-01-30 19:25:19 +00:00
Sandeep Patil
a4607a2e0c
init: split property context into platform & non-platform components am: 7a5db4ec7f
...
am: a0f91e8efc
2017-01-30 19:24:57 +00:00
Sandeep Patil
a0f91e8efc
init: split property context into platform & non-platform components
...
am: 7a5db4ec7f
2017-01-30 19:21:52 +00:00
Sandeep Patil
d04b1ac006
Merge "init: split property context into platform & non-platform components"
2017-01-30 19:16:17 +00:00
Elliott Hughes
6d5b37caba
Merge "bionic and init don't need to share knowledge of property file locations." am: 9cd890e9b7
...
am: 1890bd1b2e
2017-01-28 16:51:06 +00:00
Elliott Hughes
1890bd1b2e
Merge "bionic and init don't need to share knowledge of property file locations."
...
am: 9cd890e9b7
2017-01-28 16:48:37 +00:00
Treehugger Robot
9cd890e9b7
Merge "bionic and init don't need to share knowledge of property file locations."
2017-01-28 16:44:11 +00:00
bowgotsai
b566804ac6
Merge "fs_mgr: Switch to LOG()/PLOG() defined in <android-base/logging.h>" am: 183ca56ce2
...
am: c837e8ce1b
2017-01-28 01:43:03 +00:00
bowgotsai
c837e8ce1b
Merge "fs_mgr: Switch to LOG()/PLOG() defined in <android-base/logging.h>"
...
am: 183ca56ce2
2017-01-28 01:40:35 +00:00
Treehugger Robot
183ca56ce2
Merge "fs_mgr: Switch to LOG()/PLOG() defined in <android-base/logging.h>"
2017-01-28 01:37:22 +00:00
Elliott Hughes
795798d62c
bionic and init don't need to share knowledge of property file locations.
...
So move them into init.
Bug: http://b/33926793
Test: boots
Change-Id: I5a9601180df589b8c87ac8195a02ee24b531d4da
2017-01-27 16:21:55 -08:00
Paul Lawrence
ac1e8d916e
Merge "Allow failing app through seccomp policy" am: d0ff90afef
...
am: 50e88dc5b3
2017-01-27 20:07:33 +00:00
Paul Lawrence
50e88dc5b3
Merge "Allow failing app through seccomp policy"
...
am: d0ff90afef
2017-01-27 20:05:04 +00:00
Treehugger Robot
d0ff90afef
Merge "Allow failing app through seccomp policy"
2017-01-27 20:02:56 +00:00
James Hawkins
342df52401
Merge "boottime/init: Report ro.boottime.init* properties in milliseconds." am: 7dde4fa4e2
...
am: 1512241b68
2017-01-27 18:44:59 +00:00
James Hawkins
1512241b68
Merge "boottime/init: Report ro.boottime.init* properties in milliseconds."
...
am: 7dde4fa4e2
2017-01-27 18:42:58 +00:00
James Hawkins
7dde4fa4e2
Merge "boottime/init: Report ro.boottime.init* properties in milliseconds."
2017-01-27 18:37:22 +00:00
Paul Lawrence
e4ddaa4f2f
Allow failing app through seccomp policy
...
Bug: 34651972
Test: Made sure failing app went to login screen
Change-Id: I111a379f3e8283aa829d9ceb97f95b34bbee4055
2017-01-27 18:32:11 +00:00
Paul Lawrence
d5d167de46
Merge "Allow __NR_perf_event_open" am: 3711469ec6
...
am: a1ad789fbb
2017-01-27 18:15:57 +00:00
Paul Lawrence
a1ad789fbb
Merge "Allow __NR_perf_event_open"
...
am: 3711469ec6
2017-01-27 18:13:58 +00:00
Treehugger Robot
3711469ec6
Merge "Allow __NR_perf_event_open"
2017-01-27 18:07:06 +00:00
James Hawkins
27c052263c
boottime/init: Report ro.boottime.init* properties in milliseconds.
...
* Nanosecond precision ended up being harder to grok.
* This change modifies the Timer class to have duration_ms instead of
duration_ns.
Bug: 34466121
Test: adb logcat | grep bootstat
Change-Id: Ibd1c27dc3cb29d838a956e342281b2fb98d752a6
2017-01-27 08:26:14 -08:00
Paul Lawrence
73f6e44c8b
Allow __NR_perf_event_open
...
Bug: 34732712
Test: strace simpleperf32 record -g runs
Change-Id: Id2ffd1e808587bf809a7ff0303163816a0e8fbce
2017-01-27 08:25:56 -08:00
Mark Salyzyn
b8accd1108
Merge "logd: multiple identical do not report expired" am: f0cccf4565
...
am: 9627217f4c
2017-01-27 15:25:15 +00:00
Mark Salyzyn
9627217f4c
Merge "logd: multiple identical do not report expired"
...
am: f0cccf4565
2017-01-27 15:22:46 +00:00
Treehugger Robot
f0cccf4565
Merge "logd: multiple identical do not report expired"
2017-01-27 15:17:04 +00:00
Elliott Hughes
be34e5661d
Merge "Support arbitrary-length properties in property_list." am: c8121ba029
...
am: 92aab6dbd1
2017-01-27 07:38:41 +00:00
Mark Salyzyn
f8f1f485b0
Merge "liblog: export log/log_read.h to vndk" am: ff21dba167
...
am: 5e170bf5d4
2017-01-27 07:38:17 +00:00
