Commit graph

27953 commits

Author SHA1 Message Date
Josh Gao
35e23ed267 Merge "debuggerd_handler: improve nonfatal signal message." am: 698035b8fe am: d78eb9cd9e
am: ed967379b0

Change-Id: Ie7f2c38493316e18b6a016e37b1d9b345bb79af2
2017-01-31 04:06:45 +00:00
Josh Gao
ed967379b0 Merge "debuggerd_handler: improve nonfatal signal message." am: 698035b8fe
am: d78eb9cd9e

Change-Id: Id90058e901bd6ab149c6dbfd451236dae0152c3c
2017-01-31 04:04:45 +00:00
Josh Gao
d78eb9cd9e Merge "debuggerd_handler: improve nonfatal signal message."
am: 698035b8fe

Change-Id: Ia7f8c7629c8a2390fb7b4e048e2d46216678c811
2017-01-31 04:02:17 +00:00
Josh Gao
698035b8fe Merge "debuggerd_handler: improve nonfatal signal message." 2017-01-31 03:57:20 +00:00
Josh Gao
4ed00c8d73 debuggerd_handler: improve nonfatal signal message.
"Fatal signal 35 (???)" -> "Requested dump for"

Bug: http://b/34809044
Test: debuggerd -b $$
Change-Id: I9ece0ee1117203d30142b843973ed7e5435e21da
2017-01-30 17:58:04 -08:00
mtezych
3185d5f693 Merge "libsync: Replace inserting tuple into unordered_map in favour of pair." am: 0617179c8c am: 32b3c649f5
am: 2a75fa607a

Change-Id: I7da31d2d9d1fcdabbf5ca3516b235a0237293948
2017-01-31 01:24:22 +00:00
mtezych
e911d262df libsync: Replace inserting tuple into unordered_map in favour of pair. am: 380b2f4fea am: 3500cee3e1
am: 898f852d38

Change-Id: Ic05dbf0be2ccbb524d984b3bde26a6b70c05320a
2017-01-31 01:23:32 +00:00
mtezych
2a75fa607a Merge "libsync: Replace inserting tuple into unordered_map in favour of pair." am: 0617179c8c
am: 32b3c649f5

Change-Id: I013b2a2fea09d76d2550ceb5a71288d6268101dd
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

Change-Id: I1a20454187176c8a0d4443aa3e7625b9e28ee3c1
2017-01-31 01:21:31 +00:00
mtezych
32b3c649f5 Merge "libsync: Replace inserting tuple into unordered_map in favour of pair."
am: 0617179c8c

Change-Id: I6a4059685b8fd18ecc2b54d8ee3b0e4630e7f3a7
2017-01-31 01:18:42 +00:00
mtezych
3500cee3e1 libsync: Replace inserting tuple into unordered_map in favour of pair.
am: 380b2f4fea

Change-Id: I7d51073a79862b2f7f03acb5b175d3956b407b0d
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
764b040b1c Merge "Revert "Continue using the legacy NDK android/log.h."" am: 33aa9fc0e1 am: cb29e6e94f
am: f598640e48

Change-Id: I691573d6e7332ca8f010593e49f889054eb35b99
2017-01-31 00:22:30 +00:00
Mark Salyzyn
f598640e48 Merge "Revert "Continue using the legacy NDK android/log.h."" am: 33aa9fc0e1
am: cb29e6e94f

Change-Id: I09f2c99e86e92b68129fe31715461e030a5c73f4
2017-01-31 00:20:28 +00:00
Mark Salyzyn
cb29e6e94f Merge "Revert "Continue using the legacy NDK android/log.h.""
am: 33aa9fc0e1

Change-Id: I3503c798091849462ac68fae662bbf61eed2a799
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
e6b2d0801f Merge "Do not build any host targets on mac." am: a6c62f6832 am: f2950bd60f
am: 741308d0f6

Change-Id: I71c9d48ec8ae9cead192340d2578e9ab6b4b921f
2017-01-30 23:42:56 +00:00
Christopher Ferris
741308d0f6 Merge "Do not build any host targets on mac." am: a6c62f6832
am: f2950bd60f

Change-Id: Ic9af6f017257fb6d783c6a84f0375fba25e3a306
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

Change-Id: Ib4252fceaf07be8f2bd55ec2bc7da42e4b1993a1
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

Test: build
Bug: 30465923
Bug: 34250038
Change-Id: I7d4a5134bb711051283c36a2d5bc803436dca12e
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
649a04136e Merge "Remote reference to log/logger.h" am: a5cfc8b1e6 am: 7ac7dd82dc
am: fe71a826f1

Change-Id: I7a650b2c111c83de6db116fa2028a7b9e9941914
2017-01-30 21:41:19 +00:00
Christopher Ferris
fe71a826f1 Merge "Remote reference to log/logger.h" am: a5cfc8b1e6
am: 7ac7dd82dc

Change-Id: I77a820659804ab30a892d9e748439c9e1c5126df
2017-01-30 21:39:18 +00:00
Christopher Ferris
7ac7dd82dc Merge "Remote reference to log/logger.h"
am: a5cfc8b1e6

Change-Id: I575b0fd3c82b548be50519c68be254a34d344f67
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
50561421c7 Merge "New version of unwinder." am: e69b1b9831 am: 46895b8af7
am: dc33c4723a

Change-Id: I3a4333e1b1461c39a68ac5e811bad4b929b14abb
2017-01-30 21:11:19 +00:00
Christopher Ferris
dc33c4723a Merge "New version of unwinder." am: e69b1b9831
am: 46895b8af7

Change-Id: I931660f26a9b1dfbffa136896dee55215eb8ced3
2017-01-30 21:08:47 +00:00
Christopher Ferris
46895b8af7 Merge "New version of unwinder."
am: e69b1b9831

Change-Id: Ifaf9faa0d6e1cbdbbd55638ceb0f55b79a82922c
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
f3ec3b6c2d Merge "init: split property context into platform & non-platform components" am: d04b1ac006 am: b6aa686c71
am: 3a78d95755

Change-Id: I7a3c6a37e3722cc5892847c11438f8581add418f
2017-01-30 19:31:06 +00:00
Sandeep Patil
3a78d95755 Merge "init: split property context into platform & non-platform components" am: d04b1ac006
am: b6aa686c71

Change-Id: I06d76c258312fcf70a6c2f63baa5999cdfff86e4
2017-01-30 19:29:04 +00:00
Sandeep Patil
0b5935b956 init: split property context into platform & non-platform components am: 7a5db4ec7f am: a0f91e8efc
am: a4607a2e0c

Change-Id: I85e54f4bdab68d0de1737ba894163512c45acf4a
2017-01-30 19:28:59 +00:00
Sandeep Patil
b6aa686c71 Merge "init: split property context into platform & non-platform components"
am: d04b1ac006

Change-Id: I2ba052e3823606d8171aa39391b7d0259033c5cf
2017-01-30 19:25:19 +00:00
Sandeep Patil
a4607a2e0c init: split property context into platform & non-platform components am: 7a5db4ec7f
am: a0f91e8efc

Change-Id: I2ae968586726bb8639dce914e5bc3f783f21d42e
2017-01-30 19:24:57 +00:00
Sandeep Patil
a0f91e8efc init: split property context into platform & non-platform components
am: 7a5db4ec7f

Change-Id: Ic0e4926d9142b56256cce3ba7e27d4dc231fe856
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
7ea357283a Merge "bionic and init don't need to share knowledge of property file locations." am: 9cd890e9b7 am: 1890bd1b2e
am: 6d5b37caba

Change-Id: I5f337b959fb2950545cc032811b3a727860378e8
2017-01-28 16:53:07 +00:00
Elliott Hughes
6d5b37caba Merge "bionic and init don't need to share knowledge of property file locations." am: 9cd890e9b7
am: 1890bd1b2e

Change-Id: I029da89e05b6bc5eff525742241132ea77275616
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

Change-Id: I5dea4b63c71322d1e5502c3f1a4f449a91b15b71
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
15e651db29 Merge "fs_mgr: Switch to LOG()/PLOG() defined in <android-base/logging.h>" am: 183ca56ce2 am: c837e8ce1b
am: b566804ac6

Change-Id: Id6df2ef22308839386a256275bf42ffe76425094
2017-01-28 01:45:33 +00:00
bowgotsai
b566804ac6 Merge "fs_mgr: Switch to LOG()/PLOG() defined in <android-base/logging.h>" am: 183ca56ce2
am: c837e8ce1b

Change-Id: I6c6850d22258b1241a4e5e42244ed46ebf53e06b
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

Change-Id: I79539d8219d6f1e2129c8609fa04f8a0e6183fd6
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
Nick Desaulniers
d8d0d2fe8a fingerprint: bump hw api version to 2.1 [DO NOT MERGE]
am: 4e3e5fd9d4

Change-Id: I8828e7d2ed7e0e8d2429e37978cfc869a96a708b
2017-01-27 22:11:15 +00:00
Paul Lawrence
967e852891 Merge "Allow failing app through seccomp policy" am: d0ff90afef am: 50e88dc5b3
am: ac1e8d916e

Change-Id: Iadb5f9f7cd34d298c6208e9a9233b6abe78b84ea
2017-01-27 20:09:34 +00:00