Jiyong Park
2e24e8e2f0
Merge "Configure ld.config.txt for SP-HALs" into oc-dev am: 43b72b58f2
...
am: 7610066315
Change-Id: I59ede8903c6890b976ef3ca42c7ad1d220470a42
2017-04-15 02:07:02 +00:00
Bowgo Tsai
eebd987936
Merge changes from topic 'avb-early-mount' into oc-dev am: cc23327951
-s ours
...
am: 5924523eb2
Change-Id: I9c5b1e4d9045be44900d9d6d5351cf8cd2a5060d
2017-04-15 02:06:44 +00:00
Jiyong Park
7610066315
Merge "Configure ld.config.txt for SP-HALs" into oc-dev
...
am: 43b72b58f2
Change-Id: I3e7e5f142f6c8e76da26e25362eccd35f10b81f1
2017-04-15 02:04:49 +00:00
Bowgo Tsai
5924523eb2
Merge changes from topic 'avb-early-mount' into oc-dev
...
am: cc23327951
-s ours
Change-Id: Ib1290196a8f08ffecf936f4393807d69c77eaa10
2017-04-15 02:04:27 +00:00
TreeHugger Robot
43b72b58f2
Merge "Configure ld.config.txt for SP-HALs" into oc-dev
2017-04-15 01:47:39 +00:00
Keun-young Park
007b7110ab
Merge "check ext4 magic before running next steps" am: 82bd278dc4
am: 9183d0701d
am: 8a8ac86cf6
...
am: ab389288ad
Change-Id: I40650830f287b73e7ff40be31b7a6f9f6f69e501
2017-04-15 01:36:55 +00:00
TreeHugger Robot
cc23327951
Merge changes from topic 'avb-early-mount' into oc-dev
...
* changes:
fs_mgr: support AVB in fs_mgr_update_verity_state()
init: support early_mount with vboot 2.0 (external/avb/libavb)
fs_mgr: adds/changes some public APIs for early mount in init
fs_mgr_avb: refactors how vbmeta is loaded
fs_mgr: adding fs_mgr_get_slot_suffix() public API
2017-04-15 01:12:33 +00:00
Keun-young Park
ab389288ad
Merge "check ext4 magic before running next steps" am: 82bd278dc4
am: 9183d0701d
...
am: 8a8ac86cf6
Change-Id: I98e37f994cf08f92cada289f64dda9530c64b4f3
2017-04-15 00:35:39 +00:00
Keun-young Park
8a8ac86cf6
Merge "check ext4 magic before running next steps" am: 82bd278dc4
...
am: 9183d0701d
Change-Id: I0ef0cfe69695dce01398cd6fe7a469d4ddbbba4e
2017-04-15 00:33:06 +00:00
Elliott Hughes
1abf533ae8
Merge "Revert "Send property_service AVC messages to the kernel audit system"" am: eea60804f6
am: aee26df200
am: 246a7e57b8
...
am: 77fc053638
Change-Id: I1edd70a8b2ec0dab7f72d2797bafcf39520a0984
2017-04-15 00:32:19 +00:00
Alistair Strachan
8a8e411868
Merge "libsync: ndk: Fix compilation in C mode." into oc-dev am: fb803d50d0
...
am: 409db49df8
Change-Id: Ic498ff2c35010988cdfeea107c313ed9ead09eaa
2017-04-15 00:32:03 +00:00
Keun-young Park
9183d0701d
Merge "check ext4 magic before running next steps"
...
am: 82bd278dc4
Change-Id: I78a510725a199b5056ede41492e07b45dce022f5
2017-04-15 00:30:35 +00:00
Elliott Hughes
77fc053638
Merge "Revert "Send property_service AVC messages to the kernel audit system"" am: eea60804f6
am: aee26df200
...
am: 246a7e57b8
Change-Id: Ibf1c376d96c1d9000b44b89432d6c959d050309b
2017-04-15 00:29:22 +00:00
Keun-young Park
82bd278dc4
Merge "check ext4 magic before running next steps"
2017-04-15 00:26:32 +00:00
Elliott Hughes
246a7e57b8
Merge "Revert "Send property_service AVC messages to the kernel audit system"" am: eea60804f6
...
am: aee26df200
Change-Id: I52782f3954cfe697dfa134ef778b0835650d5e16
2017-04-15 00:21:35 +00:00
Elliott Hughes
aee26df200
Merge "Revert "Send property_service AVC messages to the kernel audit system""
...
am: eea60804f6
Change-Id: I030cd689a554f6af953a95fc903ffad31280486a
2017-04-15 00:18:34 +00:00
Alistair Strachan
409db49df8
Merge "libsync: ndk: Fix compilation in C mode." into oc-dev
...
am: fb803d50d0
Change-Id: Ifd281185c536fc00552ee8e9a47ca8290373ef95
2017-04-15 00:14:32 +00:00
Elliott Hughes
eea60804f6
Merge "Revert "Send property_service AVC messages to the kernel audit system""
2017-04-15 00:13:47 +00:00
TreeHugger Robot
fb803d50d0
Merge "libsync: ndk: Fix compilation in C mode." into oc-dev
2017-04-15 00:08:16 +00:00
Colin Cross
bd6ee7a502
Merge "Revert "libsystem_headers: export libaudio_system_headers"" into oc-dev am: 76db3a5234
...
am: 0410d3a44b
Change-Id: Iedc1a0720f906c67d8c618e82c43c2801c16210f
2017-04-14 23:14:03 +00:00
Colin Cross
0410d3a44b
Merge "Revert "libsystem_headers: export libaudio_system_headers"" into oc-dev
...
am: 76db3a5234
Change-Id: If5cf54de77b2765025b88335cb98c08c24edb163
2017-04-14 23:08:27 +00:00
TreeHugger Robot
76db3a5234
Merge "Revert "libsystem_headers: export libaudio_system_headers"" into oc-dev
2017-04-14 23:02:30 +00:00
Alistair Strachan
5bebf84845
libsync: ndk: Fix compilation in C mode.
...
Use of 'inline' without 'static' may allow the C compiler to uninline it
within the compilation unit, depending on the C standard level. Always
using 'static inline' avoids this problem.
Test: build + boot to launcher
Change-Id: Ifb6e1fa6b84286067ddc2daca4c8942c410e56ab
2017-04-14 15:12:06 -07:00
Tom Cherry
3ea6245ad5
Merge changes I9d0482d1,Ib82833be am: b87f1c1728
am: 43473d3a54
am: dfb81ce15a
...
am: d374d59c09
Change-Id: Icf73dd711aef2bd6a20828b4df30dcc7265ad766
2017-04-14 22:00:08 +00:00
Tom Cherry
d374d59c09
Merge changes I9d0482d1,Ib82833be am: b87f1c1728
am: 43473d3a54
...
am: dfb81ce15a
Change-Id: Iadacb505e72b41ee3845ad48dda192094ca6f53e
2017-04-14 21:56:25 +00:00
Tom Cherry
dfb81ce15a
Merge changes I9d0482d1,Ib82833be am: b87f1c1728
...
am: 43473d3a54
Change-Id: I64d1dcf789eea0c6a184368be869f04a2933b47e
2017-04-14 21:51:53 +00:00
Tom Cherry
43473d3a54
Merge changes I9d0482d1,Ib82833be
...
am: b87f1c1728
Change-Id: Ia031560d95ab967ea12d4c971de32308c5bb9888
2017-04-14 21:49:24 +00:00
Mark Salyzyn
2674a7c50a
Merge changes I596b8706,I262c0377,Iaf2bee97 am: 030b4d1b08
am: 3447f72d43
am: fa80674a19
...
am: f4dbbea20c
Change-Id: I161e7b9e577c3e8fbb68d15e992446e81a69b345
2017-04-14 21:45:41 +00:00
Tom Cherry
b87f1c1728
Merge changes I9d0482d1,Ib82833be
...
* changes:
ueventd: convert platform_names from C list to std::vector
ueventd: replace char* with std::string in struct uevent
2017-04-14 21:44:35 +00:00
Mark Salyzyn
f4dbbea20c
Merge changes I596b8706,I262c0377,Iaf2bee97 am: 030b4d1b08
am: 3447f72d43
...
am: fa80674a19
Change-Id: I94bad3a2c64194c2377de4277c066bbd3030f823
2017-04-14 21:43:15 +00:00
Mark Salyzyn
fa80674a19
Merge changes I596b8706,I262c0377,Iaf2bee97 am: 030b4d1b08
...
am: 3447f72d43
Change-Id: If957237f25beff6343f726ba1723b3486dbaf8dd
2017-04-14 21:39:34 +00:00
Mark Salyzyn
3447f72d43
Merge changes I596b8706,I262c0377,Iaf2bee97
...
am: 030b4d1b08
Change-Id: Id2f09fb60bc772a55206c70b3385fa0651e83233
2017-04-14 21:37:07 +00:00
Mark Salyzyn
030b4d1b08
Merge changes I596b8706,I262c0377,Iaf2bee97
...
* changes:
liblog: allow event tags to include some punctuations
liblog: logprint supports number of seconds time event field
logcat: test: standardize rest() to let logs land when injecting
2017-04-14 21:33:23 +00:00
Mark Salyzyn
ade10ba357
Merge "logd: statistics truncate name" am: 42d524f73d
am: 7f9719be48
am: 00c87bcf73
...
am: 5bc976b112
Change-Id: Ib56e1eda8a2f77553baa6c63a79589c52e4cd5d9
2017-04-14 21:15:12 +00:00
Mark Salyzyn
5bc976b112
Merge "logd: statistics truncate name" am: 42d524f73d
am: 7f9719be48
...
am: 00c87bcf73
Change-Id: I81de78de58de4809004a42a3b352bd25780d5e05
2017-04-14 21:05:03 +00:00
Colin Cross
fc57708aeb
Revert "libsystem_headers: export libaudio_system_headers"
...
This reverts commit c83ea95654
.
Change-Id: I86d89381257e975654bbd0d4e71c35ca77e87228
2017-04-14 21:02:49 +00:00
Mark Salyzyn
00c87bcf73
Merge "logd: statistics truncate name" am: 42d524f73d
...
am: 7f9719be48
Change-Id: I3751a3acb99562a20a1cdfe728e4e3fe210c69f9
2017-04-14 20:56:50 +00:00
Mark Salyzyn
7f9719be48
Merge "logd: statistics truncate name"
...
am: 42d524f73d
Change-Id: I0070356dbf0fc18babb3720ed038b5db2245e295
2017-04-14 20:54:47 +00:00
Treehugger Robot
42d524f73d
Merge "logd: statistics truncate name"
2017-04-14 20:48:43 +00:00
Josh Gao
c6e404c83e
Merge changes from topics 'adb_thread', 'adb_loopback' am: 0301b3217b
am: 750dfee974
am: da1f886ed8
...
am: 5d6593c5f7
Change-Id: I9f95633015ec7194b4bab54a0626ab99d90504ee
2017-04-14 20:23:08 +00:00
Josh Gao
2abb5f879c
adb: kill adb_thread_{create, join, detach, exit}. am: e1dacfc1b6
am: d56eebd6c2
am: ae80841ac7
...
am: 86a55ba49d
Change-Id: Ia99182c2f5eef3bcbd1a978bf8bdfeb3dfbd0be1
2017-04-14 20:23:02 +00:00
Josh Gao
1a4a570a23
adb: don't try to resolve 'localhost' am: 46de1d7f03
am: 32d7ede78b
am: 677a73e5f1
...
am: 368e043a7b
Change-Id: I7586b4bd3622911eade0bfbf40359b7797d6eed1
2017-04-14 20:22:55 +00:00
Josh Gao
5d6593c5f7
Merge changes from topics 'adb_thread', 'adb_loopback' am: 0301b3217b
am: 750dfee974
...
am: da1f886ed8
Change-Id: I0a20514a043312c069e81166cd7b980ce3e54490
2017-04-14 20:14:43 +00:00
Josh Gao
86a55ba49d
adb: kill adb_thread_{create, join, detach, exit}. am: e1dacfc1b6
am: d56eebd6c2
...
am: ae80841ac7
Change-Id: I0a28c88e5735f73dc1a833764aab70a59ae8bbc9
2017-04-14 20:14:34 +00:00
Josh Gao
368e043a7b
adb: don't try to resolve 'localhost' am: 46de1d7f03
am: 32d7ede78b
...
am: 677a73e5f1
Change-Id: I3e939fbea6cb3f3b7cf36040a81655d5ef0acae2
2017-04-14 20:14:26 +00:00
Josh Gao
da1f886ed8
Merge changes from topics 'adb_thread', 'adb_loopback' am: 0301b3217b
...
am: 750dfee974
Change-Id: I0553a8c70ac8a04bd2a32138e2bdd5f63e894258
2017-04-14 20:10:04 +00:00
Josh Gao
ae80841ac7
adb: kill adb_thread_{create, join, detach, exit}. am: e1dacfc1b6
...
am: d56eebd6c2
Change-Id: Ifde4ae5035c4caf5df66c640bfc28e163dd60b5a
2017-04-14 20:09:58 +00:00
Josh Gao
677a73e5f1
adb: don't try to resolve 'localhost' am: 46de1d7f03
...
am: 32d7ede78b
Change-Id: If87595c35e362f1fa5c34cba4d7bc1766ec51cd0
2017-04-14 20:09:53 +00:00
Josh Gao
750dfee974
Merge changes from topics 'adb_thread', 'adb_loopback'
...
am: 0301b3217b
Change-Id: I18578729590be59de526dbda364627b28503a092
2017-04-14 20:08:12 +00:00
Josh Gao
d56eebd6c2
adb: kill adb_thread_{create, join, detach, exit}.
...
am: e1dacfc1b6
Change-Id: I5e0324b33d40f873d196946cee7591de0b7b949c
2017-04-14 20:08:04 +00:00