Yabin Cui
83e4e6d35c
Merge "Fix bootloader_message."
...
am: 7c95fe10de
2016-10-18 23:36:28 +00:00
Treehugger Robot
7c95fe10de
Merge "Fix bootloader_message."
2016-10-18 23:23:09 +00:00
Yabin Cui
0d5b85944c
Fix bootloader_message.
...
Bug: 29945717
Change-Id: I934fd6c52b0111937fa75455de2fa4157fb30f6f
(cherry picked from commit 9da04d595f
2016-10-18 15:10:59 -07:00
Tao Bao
69c117c2ff
resolve merge conflicts of e89bf25 to stage-aosp-master
...
Change-Id: I3b0ddb23daf264d407370cd8ace31eceb230a11a
2016-10-18 15:08:07 -07:00
Tao Bao
e89bf257a1
Merge "Create bootloader_message static library."
2016-10-18 21:48:23 +00:00
Tianjie Xu
8176cf232e
resolve merge conflicts of 6fba98c to stage-aosp-master
...
Change-Id: I2fa8b85109309ec88c1f8d8def593aa65ab885d7
2016-10-18 21:31:04 +00:00
Yabin Cui
8b309f6970
Create bootloader_message static library.
...
bootloader_messages merges bootloader_message_writer
and bootloader.cpp, so we can use the same library to
manage bootloader_message in normal boot and recovery mode.
Bug: 29582118
Change-Id: I9efdf776ef8f02b53911ff43a518e035e0c29618
(cherry picked from commit 2f272c0551
2016-10-18 11:37:05 -07:00
Tianjie Xu
6fba98ce64
Merge "Replace minzip with libziparchive"
2016-10-18 17:30:02 +00:00
Tianjie Xu
8cf5c8f60f
Replace minzip with libziparchive
...
Clean up the duplicated codes that handle the zip files in
bootable/recovery; and rename the library of the remaining
utility functions to libotautil.
Test: Update package installed successfully on angler.
Bug: 19472796
Change-Id: Iea8962fcf3004473cb0322b6bb3a9ea3ca7f679e
2016-10-17 17:41:51 -07:00
Tianjie Xu
430b7ae469
Merge "Change StringValue to use std::string"
...
am: 2b17b24ae5
2016-10-18 00:15:29 +00:00
Treehugger Robot
2b17b24ae5
Merge "Change StringValue to use std::string"
2016-10-18 00:05:12 +00:00
Tao Bao
4de11bb370
Merge "init: move healthd to late-init"
...
am: a01ffc73ef
2016-10-17 17:44:33 +00:00
Tao Bao
a01ffc73ef
Merge "init: move healthd to late-init"
2016-10-17 17:32:56 +00:00
Tianjie Xu
aced5d9e4e
Change StringValue to use std::string
...
Changing the field of 'Value' in edify to std::string from char*.
Meanwhile cleaning up the users of 'Value' and switching them to
cpp style.
Test: compontent tests passed.
Bug: 31713288
Change-Id: Iec5a7d601b1e4ca40935bf1c70d325dafecec235
2016-10-15 01:18:23 +00:00
Tao Bao
ddf293aa0c
resolve merge conflicts of 08d0ae9 to stage-aosp-master
...
Change-Id: I4d0cc04fd5853cabdd950691dfb2e7115cb1ff17
2016-10-14 15:51:00 -07:00
Treehugger Robot
08d0ae9254
Merge "Fix the prefix matching for uncrypt status."
2016-10-14 22:39:19 +00:00
Tao Bao
ee9b95544a
Fix the prefix matching for uncrypt status.
...
Also change its logging statement from PLOG to LOG, since
android::base::StartsWith() doesn't set errno.
Test: Build and reboot into recovery image. Check last_log.
Change-Id: I55ac7eec24228db76a13580958b4a4330b06cf57
2016-10-13 16:07:15 -07:00
Tao Bao
1b1a4edb4b
Merge "edify: Some clean-ups to libedify." am: c5b4b71913 am: 039e9dc5ca
...
am: bd16939bbf
2016-10-13 17:50:16 +00:00
Tao Bao
bd16939bbf
Merge "edify: Some clean-ups to libedify." am: c5b4b71913
...
am: 039e9dc5ca
2016-10-13 17:38:14 +00:00
Tao Bao
039e9dc5ca
Merge "edify: Some clean-ups to libedify."
...
am: c5b4b71913
2016-10-13 17:30:14 +00:00
Tao Bao
c5b4b71913
Merge "edify: Some clean-ups to libedify."
2016-10-13 17:18:07 +00:00
Tao Bao
39119ad8ec
edify: Some clean-ups to libedify.
...
- Remove dead declarations in expr.h: SetError(), GetError(),
ClearError().
- Remove the declaration of Build() out of expr.h.
- Use std::unordered_map to implement RegisterFunction() and
FindFunction(); kill FinishRegistration().
- Add a testcase for calling unknown functions.
Test: mmma bootable/recovery; recovery_component_test passes.
Change-Id: I9af6825ae677f92b22d716a4a5682f58522af03b
2016-10-12 23:29:59 -07:00
Tao Bao
998c6debca
Merge "updater: Kill the duplicate PrintSha1() in install.cpp." am: 19bb05dfc7 am: 3ac1995cfd
...
am: aa9f017ceb
2016-10-12 19:42:24 +00:00
Tao Bao
aa9f017ceb
Merge "updater: Kill the duplicate PrintSha1() in install.cpp." am: 19bb05dfc7
...
am: 3ac1995cfd
2016-10-12 19:34:54 +00:00
Tao Bao
3ac1995cfd
Merge "updater: Kill the duplicate PrintSha1() in install.cpp."
...
am: 19bb05dfc7
2016-10-12 19:28:24 +00:00
Tao Bao
19bb05dfc7
Merge "updater: Kill the duplicate PrintSha1() in install.cpp."
2016-10-12 19:22:16 +00:00
Tao Bao
40677619d2
Merge "Refactor libupdater into a seperate module." am: a7995d7581 am: f2cbf0fbe0
...
am: 44864a75ed
2016-10-11 03:55:10 +00:00
Tao Bao
3a01338332
Refactor libupdater into a seperate module. am: 0c7839ac14 am: cf1dbfa854
...
am: 8ff7cd20ba
2016-10-11 03:55:00 +00:00
Tao Bao
44864a75ed
Merge "Refactor libupdater into a seperate module." am: a7995d7581
...
am: f2cbf0fbe0
2016-10-11 03:49:42 +00:00
Tao Bao
8ff7cd20ba
Refactor libupdater into a seperate module. am: 0c7839ac14
...
am: cf1dbfa854
2016-10-11 03:49:30 +00:00
Tao Bao
f2cbf0fbe0
Merge "Refactor libupdater into a seperate module."
...
am: a7995d7581
2016-10-11 03:44:01 +00:00
Tao Bao
cf1dbfa854
Refactor libupdater into a seperate module.
...
am: 0c7839ac14
2016-10-11 03:44:00 +00:00
Tao Bao
361342cbd2
updater: Kill the duplicate PrintSha1() in install.cpp.
...
Also add a testcase for sha1_check().
Test: mmma bootable/recovery; recovery_component_test passes.
Change-Id: I4d06d551a771aec84e460148544f68b247a7e721
2016-10-10 20:36:17 -07:00
Tao Bao
a7995d7581
Merge "Refactor libupdater into a seperate module."
2016-10-11 03:36:04 +00:00
Andriy Naborskyy
544a1562d9
init: move healthd to late-init
...
Starting healthd in early-init is not needed and can delay coldboot done
Now healthd is starting at boot as usual service.
Test: check kmsg that healthd starting after /dev/.coldboot_done
Bug: 30292927
Change-Id: I367d022f5885122da49181db3db536012e83f564
2016-10-10 17:29:11 -07:00
Tao Bao
0c7839ac14
Refactor libupdater into a seperate module.
...
So that we can write native tests for updater functions. This CL adds a
testcase for getprop() function.
Test: mmma bootable/recovery; Run recovery_component_test on device.
Change-Id: Iff4c1ff63c5c71aded2f9686fed6b71cc298c228
2016-10-10 16:49:50 -07:00
Tao Bao
c26e3770f6
Merge "Update the header path for ext4_utils." am: 2bd94433f8 am: 00a9050815
...
am: 514dc15399
2016-10-10 22:14:43 +00:00
Tao Bao
514dc15399
Merge "Update the header path for ext4_utils." am: 2bd94433f8
...
am: 00a9050815
2016-10-10 21:45:57 +00:00
Tao Bao
00a9050815
Merge "Update the header path for ext4_utils."
...
am: 2bd94433f8
2016-10-10 21:14:34 +00:00
Tao Bao
2bd94433f8
Merge "Update the header path for ext4_utils."
2016-10-10 20:07:32 +00:00
Mark Salyzyn
b2ee79101b
Merge "No longer need android/log.h" am: b330559fb6 am: 7bf11aadfd
...
am: 5ceada5bea
2016-10-10 14:30:11 +00:00
Mark Salyzyn
5ceada5bea
Merge "No longer need android/log.h" am: b330559fb6
...
am: 7bf11aadfd
2016-10-10 14:25:30 +00:00
Mark Salyzyn
7bf11aadfd
Merge "No longer need android/log.h"
...
am: b330559fb6
2016-10-10 14:19:41 +00:00
Mark Salyzyn
b330559fb6
Merge "No longer need android/log.h"
2016-10-10 14:14:30 +00:00
Tao Bao
e708954c8c
resolve merge conflicts of 09ab9a6 to nyc-mr1-dev-plus-aosp
...
Change-Id: Ifc0b085d8384f373ffffc14abd907227961efdf9
2016-10-09 14:30:46 -07:00
Tao Bao
09ab9a6838
Merge "Disable the meaningless parts of the UI for A/B." am: aa4924cab1
...
am: 8477a03a4a
2016-10-09 21:13:47 +00:00
Tao Bao
8477a03a4a
Merge "Disable the meaningless parts of the UI for A/B."
...
am: aa4924cab1
2016-10-09 21:08:47 +00:00
Tao Bao
de40ba59c8
Update the header path for ext4_utils.
...
Test: `mmma bootable/recovery`
Change-Id: I70ccddb3ddf46bb012fdc5f632afc46ebdd5473e
2016-10-09 14:02:10 -07:00
Tao Bao
aa4924cab1
Merge "Disable the meaningless parts of the UI for A/B."
2016-10-09 21:00:37 +00:00
Elliott Hughes
b0c3f6ffeb
Disable the meaningless parts of the UI for A/B.
...
Bug: http://b/28748484
Test: mmma bootable/recovery
Change-Id: Ie86a265f4699503471e7c717d65677a916dbd25b
(cherry picked from commit 01fcbe160b
2016-10-09 12:55:50 -07:00
