Commit Graph

3038 Commits

Author SHA1 Message Date
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 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 8ff7cd20ba Refactor libupdater into a seperate module. am: 0c7839ac14
am: cf1dbfa854

Change-Id: Ifb2c199bc32e164e5bd53f3910a35801237c4ef3
2016-10-11 03:49:30 +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 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
Mark Salyzyn 04f3fad29a Merge "recovery: drop log/logger.h" am: 38b923ff6c am: 7cf7e6ce4f
am: 0467a905cc

Change-Id: Idf6e3b08ac2f6209856bbad010a5f48197124597
2016-10-04 17:49:44 +00:00
Mark Salyzyn 0467a905cc Merge "recovery: drop log/logger.h" am: 38b923ff6c
am: 7cf7e6ce4f

Change-Id: Ic62c9145a6d891b2e9acd871c0e21007e2ecb6f6
2016-10-04 17:45:11 +00:00
Mark Salyzyn 7cf7e6ce4f Merge "recovery: drop log/logger.h"
am: 38b923ff6c

Change-Id: I92ddb6d9adef3f4a25588c76bade058914952b06
2016-10-04 17:42:40 +00:00
Mark Salyzyn 38b923ff6c Merge "recovery: drop log/logger.h" 2016-10-04 17:39:17 +00:00
Tao Bao 254c4bfbd4 Merge "edify: Move the testcases to gtest." am: 0bc2df1696 am: 6fbed10fa5 am: bace857dbb
am: 1f19e82930

Change-Id: Iced6882f71a74d3e65045f8ced73edb58493555d
2016-10-04 17:06:09 +00:00
Tao Bao 1f19e82930 Merge "edify: Move the testcases to gtest." am: 0bc2df1696 am: 6fbed10fa5
am: bace857dbb

Change-Id: I181613c85d81366fb517ce4851256cb1a637af15
2016-10-04 17:04:10 +00:00
Tao Bao bace857dbb Merge "edify: Move the testcases to gtest." am: 0bc2df1696
am: 6fbed10fa5

Change-Id: I1966d1fff2972fae1b4c9a1fe6fdbc07c34dcd65
2016-10-04 17:01:38 +00:00
Tao Bao 6fbed10fa5 Merge "edify: Move the testcases to gtest."
am: 0bc2df1696

Change-Id: I6c61d04cb7d2b47ef903d838ead453f51eb91ea7
2016-10-04 16:59:38 +00:00
Tao Bao 0bc2df1696 Merge "edify: Move the testcases to gtest." 2016-10-04 16:55:50 +00:00
Mark Salyzyn fee79a4532 recovery: drop log/logger.h
private/android_logger.h contains all we need.

Test: compile
Bug: 26552300
Bug: 31289077
Bug: 31456426
Change-Id: I6714d730372dc81f784e7f9dfee8a33848643a5d
2016-10-04 09:04:08 -07:00
Tao Bao d770d2e7af edify: Move the testcases to gtest.
Now they live in tests/component/edify_test.cpp.

Also rename edify/main.cpp to edify/edify_parser.cpp. It becomes a
host-side debugging tool that validates the input edify script. However,
it supports edify builtin functions only and doesn't recognize the ones
defined via updater.

Test: recovery_component_test passes on device.

Change-Id: Ib94a787bf15098a9cc078d256b6a6dc96ff12b2e
2016-10-03 15:33:20 -07:00
Tianjie Xu 0a33c02df4 Merge "Turn on -Werror for recovery" into nyc-mr1-dev-plus-aosp
am: 209e5acf4a

Change-Id: Ie13be805792a3433d58c2805f8325dfe78795bd4
2016-09-30 20:34:24 +00:00
Tianjie Xu 10e223c181 Turn on -Werror for recovery
am: 17e316cce0

Change-Id: Ia0e1948491edf7cca8b64d7e7f0cac91314c2025
2016-09-30 20:34:23 +00:00
Tianjie Xu 3ddd6fd4cf Merge "Turn on -Werror for recovery" am: 695ef7cacc am: 5269808bb0 am: dbde5cf1d5 -s ours
am: 8c403082d6

Change-Id: I546d2fd12e3c57fee7ebcf8d3e3a5b56b57f1163
2016-09-30 20:34:13 +00:00
Tianjie Xu 209e5acf4a Merge "Turn on -Werror for recovery" into nyc-mr1-dev-plus-aosp 2016-09-30 20:27:53 +00:00
Tianjie Xu 8c403082d6 Merge "Turn on -Werror for recovery" am: 695ef7cacc am: 5269808bb0
am: dbde5cf1d5  -s ours

Change-Id: I0649c3db276212804118ab4a6d7ced150585af91
2016-09-30 20:27:18 +00:00
Tianjie Xu 17e316cce0 Turn on -Werror for recovery
Also remove the 0xff comparison when validating the bootloader
message fields. As the fields won't be erased to 0xff after we
remove the MTD support.

Bug: 28202046
Test: The recovery folder compiles for aosp_x86-eng
Change-Id: Ibb30ea1b2b28676fb08c7e92a1e5f7b6ef3247ab
(cherry picked from commit 7aa88748f6)
2016-09-30 11:18:01 -07:00