Tao Bao
5f3982056d
Merge "edify: Some clean-ups to libedify." am: c5b4b71913 am: 039e9dc5ca am: bd16939bbf
...
am: 1b1a4edb4b
Change-Id: Idc74e9e549fe61c8b3bb566579821660ecf459c4
2016-10-13 18:02:46 +00:00
Tao Bao
1b1a4edb4b
Merge "edify: Some clean-ups to libedify." am: c5b4b71913 am: 039e9dc5ca
...
am: bd16939bbf
Change-Id: Ibbbe5b4b202263e4f3a5d3e802210baf81347708
2016-10-13 17:50:16 +00:00
Tao Bao
bd16939bbf
Merge "edify: Some clean-ups to libedify." am: c5b4b71913
...
am: 039e9dc5ca
Change-Id: I0188f978c2ef1497ffbad1c3e3125fa61d11ddf5
2016-10-13 17:38:14 +00:00
Tao Bao
039e9dc5ca
Merge "edify: Some clean-ups to libedify."
...
am: c5b4b71913
Change-Id: I6ac4dfc514dfa917698268a999d8435987790302
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
f3d3dca01d
Merge "updater: Kill the duplicate PrintSha1() in install.cpp." am: 19bb05dfc7 am: 3ac1995cfd am: aa9f017ceb
...
am: 998c6debca
Change-Id: Ifb2e1a950c685816a70e4edfb2514319a4b03cc1
2016-10-12 19:48:56 +00:00
Tao Bao
998c6debca
Merge "updater: Kill the duplicate PrintSha1() in install.cpp." am: 19bb05dfc7 am: 3ac1995cfd
...
am: aa9f017ceb
Change-Id: I713aa645bdff6ff6c73f28d15b46cd642e23d1a0
2016-10-12 19:42:24 +00:00
Tao Bao
aa9f017ceb
Merge "updater: Kill the duplicate PrintSha1() in install.cpp." am: 19bb05dfc7
...
am: 3ac1995cfd
Change-Id: I431110e967af930aaed0e684dc9b3b7c91a25c25
2016-10-12 19:34:54 +00:00
Tao Bao
3ac1995cfd
Merge "updater: Kill the duplicate PrintSha1() in install.cpp."
...
am: 19bb05dfc7
Change-Id: I04198ff3cdfca583334eb532f83a6ecd0bfd0ad8
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
e9c0753995
Merge "Refactor libupdater into a seperate module." am: a7995d7581 am: f2cbf0fbe0 am: 44864a75ed
...
am: 40677619d2
Change-Id: I17030f19ba6970c7943681b9f705e686ff56acfc
2016-10-11 04:00:41 +00:00
Tao Bao
df6da4adad
Refactor libupdater into a seperate module. am: 0c7839ac14 am: cf1dbfa854 am: 8ff7cd20ba
...
am: 3a01338332
Change-Id: I1d03d8107d354122edbb88a817b76c490e35210c
2016-10-11 04:00:31 +00:00
Tao Bao
40677619d2
Merge "Refactor libupdater into a seperate module." am: a7995d7581 am: f2cbf0fbe0
...
am: 44864a75ed
Change-Id: I14f5e027f8905163100d4d5bd25855544aae787d
2016-10-11 03:55:10 +00:00
Tao Bao
3a01338332
Refactor libupdater into a seperate module. am: 0c7839ac14 am: cf1dbfa854
...
am: 8ff7cd20ba
Change-Id: I421800ada6015970dae038ecd58c1d985f8b4b8f
2016-10-11 03:55:00 +00:00
Tao Bao
44864a75ed
Merge "Refactor libupdater into a seperate module." am: a7995d7581
...
am: f2cbf0fbe0
Change-Id: I0123851b44800e34b12e428df79259d656f960df
2016-10-11 03:49:42 +00:00
Tao Bao
8ff7cd20ba
Refactor libupdater into a seperate module. am: 0c7839ac14
...
am: cf1dbfa854
Change-Id: Ifb2c199bc32e164e5bd53f3910a35801237c4ef3
2016-10-11 03:49:30 +00:00
Tao Bao
f2cbf0fbe0
Merge "Refactor libupdater into a seperate module."
...
am: a7995d7581
Change-Id: Ie3b643513c44abfc2a42f5544638057a903a5070
2016-10-11 03:44:01 +00:00
Tao Bao
cf1dbfa854
Refactor libupdater into a seperate module.
...
am: 0c7839ac14
Change-Id: I5ff4c438daa6df248cee38b62251c78baac67a76
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
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
5546d785d4
Merge "Update the header path for ext4_utils." am: 2bd94433f8 am: 00a9050815 am: 514dc15399
...
am: c26e3770f6
Change-Id: Ibcf7ed88599cd997a0b240ee85900f87d88b041e
2016-10-10 22:35:39 +00:00
Tao Bao
c26e3770f6
Merge "Update the header path for ext4_utils." am: 2bd94433f8 am: 00a9050815
...
am: 514dc15399
Change-Id: I38332f7eab24a49375ef0f410a3cd3d552749e06
2016-10-10 22:14:43 +00:00
Tao Bao
514dc15399
Merge "Update the header path for ext4_utils." am: 2bd94433f8
...
am: 00a9050815
Change-Id: Id897069e1ea0ad04ee7f1096c9ae36fb2b9d7974
2016-10-10 21:45:57 +00:00
Tao Bao
00a9050815
Merge "Update the header path for ext4_utils."
...
am: 2bd94433f8
Change-Id: I6a8dbfcecbabbba26acc81ca0c704b9a7f3c63db
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
Tao Bao
1984d55ece
Merge "Update the header path for ext4_utils."
2016-10-10 16:44:40 +00:00
Mark Salyzyn
5803cbaad2
Merge "No longer need android/log.h" am: b330559fb6 am: 7bf11aadfd am: 5ceada5bea
...
am: b2ee79101b
Change-Id: Ie1a96c43737fb4b78d79cbb28a0d43ad3bfba6e6
2016-10-10 14:41:12 +00:00
Mark Salyzyn
b2ee79101b
Merge "No longer need android/log.h" am: b330559fb6 am: 7bf11aadfd
...
am: 5ceada5bea
Change-Id: Id48d36a1a61171aa199e85f50a454229c50b72e9
2016-10-10 14:30:11 +00:00
Mark Salyzyn
5ceada5bea
Merge "No longer need android/log.h" am: b330559fb6
...
am: 7bf11aadfd
Change-Id: I2399e35aacb6703aedf21bf352f47638720b7d1a
2016-10-10 14:25:30 +00:00
Mark Salyzyn
7bf11aadfd
Merge "No longer need android/log.h"
...
am: b330559fb6
Change-Id: Ie2b65008349d874eb96f40da24b1333e7e62e7da
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
6adbc2c982
resolve merge conflicts of 09ab9a6 to nyc-mr1-dev-plus-aosp
...
am: e708954c8c
Change-Id: I06343fdf7d7173e689d136bacb382fde3e3873b9
2016-10-09 21:54:57 +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
Change-Id: I55c5febd094ada3a1147ab3ebefc866108ce33e8
2016-10-09 21:13:47 +00:00
Tao Bao
8477a03a4a
Merge "Disable the meaningless parts of the UI for A/B."
...
am: aa4924cab1
Change-Id: Iaba41f4d5a4581053813beb99366cac4068725bb
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
Tao Bao
df0d2a2ae0
Update the header path for ext4_utils.
...
Test: `mmma bootable/recovery`
Change-Id: I70ccddb3ddf46bb012fdc5f632afc46ebdd5473e
(cherry picked from commit 3cbe1d20978dc488272e2b1ba10890a006fdfab9)
2016-10-07 14:33:34 -07:00
Mark Salyzyn
df1b6947ec
No longer need android/log.h
...
Test: compile
Bug: 31992412
Change-Id: I5156590bfc94e46e9d282c197c3dd8c4bbd9e855
2016-10-07 14:19:48 -07:00
Tao Bao
8570f7efd1
resolve merge conflicts of 713ad36 to master
...
Change-Id: I493df6f84005af600d92c6cb3df58de53a5c2d55
2016-10-04 23:35:38 -07:00
Tao Bao
713ad360c4
Merge "edify: Move State.script and State.errmsg to std::string." am: 8810634773 am: 6674f22a2f
...
am: e68d829f74
Change-Id: I8d9b94ca96b68a80f1418287bde4bef26ce0068a
2016-10-05 06:18:52 +00:00
Tao Bao
e68d829f74
Merge "edify: Move State.script and State.errmsg to std::string." am: 8810634773
...
am: 6674f22a2f
Change-Id: I7da4df259a8155fbdab6e696fab4ddfb45cb0fbc
2016-10-05 06:16:22 +00:00
Tao Bao
6674f22a2f
Merge "edify: Move State.script and State.errmsg to std::string."
...
am: 8810634773
Change-Id: Id8e786de6fe76287b598dfcfbf962eba5d9ebde2
2016-10-05 06:13:22 +00:00
Treehugger Robot
8810634773
Merge "edify: Move State.script and State.errmsg to std::string."
2016-10-05 06:07:56 +00:00
Tao Bao
876b9391c0
edify: Move State.script and State.errmsg to std::string.
...
This way we kill a few strdup() and free() calls.
Test: 1. recovery_component_test still passes;
2. Applying an update with the new updater works;
3. The error code in a script with abort("E310: xyz") is recorded into
last_install correctly.
Change-Id: Ibda4da5937346e058a0d7cc81764d6f02920010a
(cherry picked from commit 59dcb9cbea )
2016-10-04 15:33:22 -07:00
Tao Bao
59dcb9cbea
edify: Move State.script and State.errmsg to std::string.
...
This way we kill a few strdup() and free() calls.
Test: 1. recovery_component_test still passes;
2. Applying an update with the new updater works;
3. The error code in a script with abort("E310: xyz") is recorded into
last_install correctly.
Change-Id: Ibda4da5937346e058a0d7cc81764d6f02920010a
2016-10-04 14:24:32 -07:00
Mark Salyzyn
414d71ebf1
Merge "recovery: drop log/logger.h" am: 38b923ff6c am: 7cf7e6ce4f am: 0467a905cc
...
am: 04f3fad29a
Change-Id: I69945b52c9889884bf356a7693947a489a1ae382
2016-10-04 17:51:41 +00:00