Janis Danisevskis
8f7d80468e
Rename libkeymaster to libkeymaster_staging
...
Fix a build breakage by renaming libkeymaster to
libkeymaster_staging. fugu's vendor tree already had
a libkeymaster.so which masked system/keymaster/libkeymaster.
Bug: 37997750
Change-Id: Iead014db3f3d841f08c8072b0493ec9fd7a05055
2017-05-04 14:15:30 -07:00
Chris Forbes
754ecb83ad
Merge "libutils: Make LightFlattenablePod safe for unaligned ptr" into oc-dev am: ba73a138e0
...
am: efa6100129
2017-05-04 20:35:34 +00:00
Chris Forbes
efa6100129
Merge "libutils: Make LightFlattenablePod safe for unaligned ptr" into oc-dev
...
am: ba73a138e0
2017-05-04 20:31:36 +00:00
William Roberts
02e4d8eac7
Merge "init: cleanup exec_service documentation" am: 61559e491e am: b46b61049b am: bd633d8e2a
...
am: 1b9708bc54
2017-05-04 20:19:53 +00:00
Chris Forbes
ba73a138e0
Merge "libutils: Make LightFlattenablePod safe for unaligned ptr" into oc-dev
2017-05-04 20:19:06 +00:00
William Roberts
1b9708bc54
Merge "init: cleanup exec_service documentation" am: 61559e491e am: b46b61049b
...
am: bd633d8e2a
2017-05-04 20:14:32 +00:00
William Roberts
bd633d8e2a
Merge "init: cleanup exec_service documentation" am: 61559e491e
...
am: b46b61049b
2017-05-04 20:09:02 +00:00
William Roberts
b46b61049b
Merge "init: cleanup exec_service documentation"
...
am: 61559e491e
2017-05-04 20:06:02 +00:00
Treehugger Robot
61559e491e
Merge "init: cleanup exec_service documentation"
2017-05-04 19:54:17 +00:00
Mark Salyzyn
850d298aba
init: setup keyring before ueventd starts am: 2350391b8d
...
am: afa234f627
2017-05-04 18:18:25 +00:00
William Roberts
323d5791b4
init: cleanup exec_service documentation
...
The exec_service documentation was difficult to read, clarify it.
Tests:
Run grip.py to verify that the markdown still works correctly.
Run aspell to verify spelling.
Change-Id: I29bdd456f3d3ea2a91c9d4772bd09a5a195f97a9
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2017-05-04 11:14:23 -07:00
Mark Salyzyn
afa234f627
init: setup keyring before ueventd starts
...
am: 2350391b8d
2017-05-04 18:12:21 +00:00
Elliott Hughes
185e909bbe
Merge "Remove bogus _LARGEFILE_SOURCE." am: 3d7ee068e0 am: 8dd31c23ca am: f99cb21d51
...
am: b59a1e8a4e
2017-05-04 17:54:43 +00:00
Elliott Hughes
b59a1e8a4e
Merge "Remove bogus _LARGEFILE_SOURCE." am: 3d7ee068e0 am: 8dd31c23ca
...
am: f99cb21d51
2017-05-04 17:44:49 +00:00
Elliott Hughes
f99cb21d51
Merge "Remove bogus _LARGEFILE_SOURCE." am: 3d7ee068e0
...
am: 8dd31c23ca
2017-05-04 17:42:19 +00:00
Elliott Hughes
8dd31c23ca
Merge "Remove bogus _LARGEFILE_SOURCE."
...
am: 3d7ee068e0
2017-05-04 17:39:19 +00:00
Treehugger Robot
3d7ee068e0
Merge "Remove bogus _LARGEFILE_SOURCE."
2017-05-04 17:33:54 +00:00
Chris Forbes
c46cbcbbf9
libutils: Make LightFlattenablePod safe for unaligned ptr
...
`buffer` may not be correctly aligned here. Assignment assumes correct
alignment and so then blows up on arm32.
Bug: b/37920153
Test: build, boot device
Change-Id: I23ef7c7f1d1511fd912b9485bba955db59e33832
2017-05-04 10:18:26 -07:00
Janis Danisevskis
4234727955
Merge "libkeymaster1 split"
2017-05-04 16:16:45 +00:00
Mark Salyzyn
2350391b8d
init: setup keyring before ueventd starts
...
(cherry pick from commit 4599627492
2017-05-04 07:13:09 -07:00
TreeHugger Robot
04df8f456c
Merge "Remove redundant dependencies"
2017-05-04 08:56:29 +00:00
Elliott Hughes
92433d8af0
Remove bogus _LARGEFILE_SOURCE.
...
Bug: N/A
Test: builds
Change-Id: I145a521a58dc8f838ce188540b02bcda4e81b610
2017-05-03 22:21:16 -07:00
Jiyong Park
c1c4dada31
Merge "update /vendor/*/vndk-sp to /system/*/vndk-sp" into oc-dev am: d5398bf97d
...
am: 874ed5ec96
2017-05-04 04:27:27 +00:00
Jiyong Park
874ed5ec96
Merge "update /vendor/*/vndk-sp to /system/*/vndk-sp" into oc-dev
...
am: d5398bf97d
2017-05-04 04:24:57 +00:00
TreeHugger Robot
d5398bf97d
Merge "update /vendor/*/vndk-sp to /system/*/vndk-sp" into oc-dev
2017-05-04 04:19:33 +00:00
Jiyong Park
684ad96c27
Mark libgrallocusage as vendor_available
...
libgrallocusage is used by libui which will be vendor_available: true.
Test: BOARD_VNDK_VERSION=current m libgrallocusage is successful
Change-Id: I476768d8b103033f3b8e5b09f53f4ac422ae377c
2017-05-04 12:25:43 +09:00
Jin Qian
1e59ce40e3
Merge "init: manually restorecon mke2fs tools on ramdisk" am: e2629c5682 am: 06c1500a14 am: 2ce5eb91c0
...
am: 6cfade736d
2017-05-04 02:20:13 +00:00
Jin Qian
6cfade736d
Merge "init: manually restorecon mke2fs tools on ramdisk" am: e2629c5682 am: 06c1500a14
...
am: 2ce5eb91c0
2017-05-04 02:17:50 +00:00
Jin Qian
2ce5eb91c0
Merge "init: manually restorecon mke2fs tools on ramdisk" am: e2629c5682
...
am: 06c1500a14
2017-05-04 02:14:50 +00:00
Jin Qian
06c1500a14
Merge "init: manually restorecon mke2fs tools on ramdisk"
...
am: e2629c5682
2017-05-04 02:12:18 +00:00
Treehugger Robot
e2629c5682
Merge "init: manually restorecon mke2fs tools on ramdisk"
2017-05-04 02:07:02 +00:00
Bowgo Tsai
d987e447f0
Merge "init: fix first stage mount failure due to /dev/device-mapper not found" into oc-dev am: 22d73dd093 -s ours
...
am: da179e291c
2017-05-04 01:10:38 +00:00
Bowgo Tsai
da179e291c
Merge "init: fix first stage mount failure due to /dev/device-mapper not found" into oc-dev
...
am: 22d73dd093
2017-05-04 01:07:44 +00:00
TreeHugger Robot
22d73dd093
Merge "init: fix first stage mount failure due to /dev/device-mapper not found" into oc-dev
2017-05-04 01:00:51 +00:00
Bowgo Tsai
bfc9b6380d
init: fix first stage mount failure due to /dev/device-mapper not found
...
It has been reported that fs_mgr failed to open /dev/device-mapper
during the first stage mount. It's because other uevent (e.g., i2c
charger device) happens to be sent at the same time we're triggering
the device-mapper uevent to be sent. Current implementation returns
COLDBOOT_STOP unconditionally so it will only process the first received
uevent, leaving device-mapper uevent unhandled when the race happens.
Fix this by only returning COLDBOOT_STOP when the received uevent->path
matches that of device mapper.
Bug: 37745254
Test: first stage mount /vendor with vboot 2.0 (avb) on bullhead
Test: first stage mount /vendor with vboot 1.0 on sailfish
Change-Id: I4a77093ec8f90a5ca981a088f34d082d0270533b
Merged-In: I4a77093ec8f90a5ca981a088f34d082d0270533b
(cherry picked from commit ea5fca4cd0
2017-05-04 08:58:22 +08:00
Josh Gao
d25638cd51
Merge "adb: use the actual wMaxPacketSize for usb endpoints." am: c7988b1f68 am: ff9d6425d4 am: 44190c3709
...
am: 439f523d0c
2017-05-04 00:55:11 +00:00
Yueyao Zhu
51a8e39cfc
Merge "Add dtbo image support for device tree overlay" am: 5eefcbdd3b am: 061003841e am: aff3668634
...
am: 39e4f5b602
2017-05-04 00:54:50 +00:00
Josh Gao
439f523d0c
Merge "adb: use the actual wMaxPacketSize for usb endpoints." am: c7988b1f68 am: ff9d6425d4
...
am: 44190c3709
2017-05-04 00:21:10 +00:00
Josh Gao
44190c3709
Merge "adb: use the actual wMaxPacketSize for usb endpoints." am: c7988b1f68
...
am: ff9d6425d4
2017-05-04 00:18:40 +00:00
Josh Gao
ff9d6425d4
Merge "adb: use the actual wMaxPacketSize for usb endpoints."
...
am: c7988b1f68
2017-05-04 00:16:41 +00:00
Josh Gao
c7988b1f68
Merge "adb: use the actual wMaxPacketSize for usb endpoints."
2017-05-04 00:12:23 +00:00
Yueyao Zhu
39e4f5b602
Merge "Add dtbo image support for device tree overlay" am: 5eefcbdd3b am: 061003841e
...
am: aff3668634
2017-05-04 00:01:39 +00:00
Tom Cherry
4ffa5c5de9
Merge "Make /data/data a symlink to /data/user/0" am: 49bbe16447 am: c43da33005 am: f95686e0cf
...
am: b4f7e5b0c4
2017-05-04 00:01:10 +00:00
Yueyao Zhu
aff3668634
Merge "Add dtbo image support for device tree overlay" am: 5eefcbdd3b
...
am: 061003841e
2017-05-03 23:59:10 +00:00
Yueyao Zhu
061003841e
Merge "Add dtbo image support for device tree overlay"
...
am: 5eefcbdd3b
2017-05-03 23:56:38 +00:00
Tom Cherry
b4f7e5b0c4
Merge "Make /data/data a symlink to /data/user/0" am: 49bbe16447 am: c43da33005
...
am: f95686e0cf
2017-05-03 23:54:23 +00:00
Josh Gao
3c82f122e7
Merge "adb: enable -Wthread-safety on linux/darwin." am: 2983d2710e am: 0c91897714 am: d3f512ebe3
...
am: 425d0db555
2017-05-03 23:52:36 +00:00
Mark Salyzyn
b3d51c164a
Merge changes Ieb44fa8f,I01b26fe5 am: e1e3e20337 am: d8dc29df8e am: b519cb5e14
...
am: b48c99a93d
2017-05-03 23:52:16 +00:00
Tom Cherry
f95686e0cf
Merge "Make /data/data a symlink to /data/user/0" am: 49bbe16447
...
am: c43da33005
2017-05-03 23:51:50 +00:00
Josh Gao
425d0db555
Merge "adb: enable -Wthread-safety on linux/darwin." am: 2983d2710e am: 0c91897714
...
am: d3f512ebe3
2017-05-03 23:48:58 +00:00
