Tao Bao and android-build-merger
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 and android-build-merger
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 and android-build-merger
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 and android-build-merger
6fbed10fa5
Merge "edify: Move the testcases to gtest."
...
am: 0bc2df1696
Change-Id: I6c61d04cb7d2b47ef903d838ead453f51eb91ea7
2016-10-04 16:59:38 +00:00
Tao Bao and Gerrit Code Review
0bc2df1696
Merge "edify: Move the testcases to gtest."
2016-10-04 16:55:50 +00: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 and android-build-merger
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 and android-build-merger
10e223c181
Turn on -Werror for recovery
...
am: 17e316cce0
Change-Id: Ia0e1948491edf7cca8b64d7e7f0cac91314c2025
2016-09-30 20:34:23 +00:00
Tianjie Xu and android-build-merger
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 and Android (Google) Code Review
209e5acf4a
Merge "Turn on -Werror for recovery" into nyc-mr1-dev-plus-aosp
2016-09-30 20:27:53 +00:00
Tianjie Xu and android-build-merger
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
Tianjie Xu and android-build-merger
dbde5cf1d5
Merge "Turn on -Werror for recovery" am: 695ef7cacc
...
am: 5269808bb0
Change-Id: I84ce95dc0365925535da0d5bfb9397c5b23bd1af
2016-09-30 17:48:23 +00:00
Tianjie Xu and android-build-merger
5269808bb0
Merge "Turn on -Werror for recovery"
...
am: 695ef7cacc
Change-Id: If8cb1fd9470c4ae6798dc4ecf1707c5eb40b877e
2016-09-30 17:45:35 +00:00
Tianjie Xu and Gerrit Code Review
695ef7cacc
Merge "Turn on -Werror for recovery"
2016-09-30 17:41:14 +00:00
Tianjie Xu
7aa88748f6
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
2016-09-29 19:21:24 -07:00
Tianjie Xu and android-build-merger
e792fa4629
Merge "Report uncrypt errors in details" into nyc-mr1-dev-plus-aosp
...
am: 4c3f6ab8f7
Change-Id: I50e5c8484768c10604bd78ce7bba5c2e83bc6f04
2016-09-29 19:44:26 +00:00
Tianjie Xu and android-build-merger
c8fbbc786c
Report uncrypt errors in details
...
am: 68fc81e860
Change-Id: I57eff7b0aaa388c32dc8e99318e68ca25ff5c02d
2016-09-29 19:44:26 +00:00
TreeHugger Robot and Android (Google) Code Review
4c3f6ab8f7
Merge "Report uncrypt errors in details" into nyc-mr1-dev-plus-aosp
2016-09-29 18:51:02 +00:00
Tianjie Xu and android-build-merger
31ee16223b
DO NOT MERGE Report uncrypt errors in details am: 37d7d67ca2 am: 4c53af080d -s ours
...
am: 2eea42f723 -s ours
Change-Id: Ie6d9a47705e023565ff9fed8676be0ca63df68a8
2016-09-29 18:33:51 +00:00
Tianjie Xu
68fc81e860
Report uncrypt errors in details
...
Add the error codes for uncrypt and report the failure details in
uncrypt_status.
Test: uncrypt_error logs correctly in last_install
Bug: 31603820
Change-Id: I8e0de845ce1707b6f8f5ae84564c5e93fd5f5ef5
(cherry picked from commit 0c68675f5ae80cd669e0bf014a69689b6fe08eee)
2016-09-29 11:27:46 -07:00
Tianjie Xu and android-build-merger
2eea42f723
DO NOT MERGE Report uncrypt errors in details am: 37d7d67ca2
...
am: 4c53af080d -s ours
Change-Id: I16ccd19d5b430c1854e5544c9c7d50be534b970f
2016-09-29 18:26:50 +00:00
Tianjie Xu and android-build-merger
4c53af080d
DO NOT MERGE Report uncrypt errors in details
...
am: 37d7d67ca2
Change-Id: I4da910cde3f1a84b9dfb5839a43b00818a942dbd
2016-09-29 18:13:20 +00:00
Tianjie Xu
37d7d67ca2
DO NOT MERGE Report uncrypt errors in details
...
Add the error codes for uncrypt and report the failure details in
uncrypt_status.
Test: uncrypt_error logs correctly in last_install
Bug: 31603820
Change-Id: I8e0de845ce1707b6f8f5ae84564c5e93fd5f5ef5
(cherry picked from commit da44cf18f3 )
2016-09-29 18:06:04 +00:00
Tianjie Xu and android-build-merger
553d47bf91
Merge "Report uncrypt errors in details" am: af8b9363c6 am: 7582609d61 am: fc887a8fba
...
am: b0d0ee3c7d
Change-Id: Ie44169accea9196457d7cae696836c3a6fe14c8e
2016-09-27 21:27:56 +00:00
Tianjie Xu and android-build-merger
b0d0ee3c7d
Merge "Report uncrypt errors in details" am: af8b9363c6 am: 7582609d61
...
am: fc887a8fba
Change-Id: I5e83be10f4443c8b107821975b3506381fcbdf0c
2016-09-27 21:25:26 +00:00
Tianjie Xu and android-build-merger
fc887a8fba
Merge "Report uncrypt errors in details" am: af8b9363c6
...
am: 7582609d61
Change-Id: Idbaf422f605c690fe2f2ea120d10e4e37342b5e9
2016-09-27 21:22:26 +00:00
Tianjie Xu and android-build-merger
7582609d61
Merge "Report uncrypt errors in details"
...
am: af8b9363c6
Change-Id: I5790f1c3ce902edf7bf9025e445b043c93036a30
2016-09-27 21:19:56 +00:00
Treehugger Robot and Gerrit Code Review
af8b9363c6
Merge "Report uncrypt errors in details"
2016-09-27 21:11:06 +00:00
Tao Bao and android-build-merger
1040ae5833
resolve merge conflicts of 64b92df to nyc-mr1-dev-plus-aosp
...
am: 772153b3c7
Change-Id: I1fcc0375b08dc776a9cc3f122b071d34241e29c8
2016-09-27 20:38:23 +00:00
Tao Bao
772153b3c7
resolve merge conflicts of 64b92df to nyc-mr1-dev-plus-aosp
...
Change-Id: I1b076d3f9b82380c74e66fe95ee8e8cf5b6eebf7
2016-09-27 13:30:43 -07:00
Tao Bao and android-build-merger
64b92dfb5d
DO NOT MERGE Duplicate the last_install content into last_log.
...
am: a8c0d0b43a
Change-Id: I6ba873dcf7b833daaf6ca74d49a6410be3e4fbcb
2016-09-27 20:24:22 +00:00
Tianjie Xu
da44cf18f3
Report uncrypt errors in details
...
Add the error codes for uncrypt and report the failure details in
uncrypt_status.
Test: uncrypt_error logs correctly in last_install
Bug: 31603820
Change-Id: I8e0de845ce1707b6f8f5ae84564c5e93fd5f5ef5
2016-09-26 22:48:45 -07:00
Tao Bao
a8c0d0b43a
DO NOT MERGE Duplicate the last_install content into last_log.
...
Currently we save the OTA metrics in last_install, which keeps the data
for the _last_ install only. This CL logs the same content into last_log
so that we keep the metrics for every install.
Bug: 31607469
Test: Apply an update (via OTA and sideload) and check last_log and last_install.
Change-Id: Id8f174d79534fddc9f06d72a4e69b2b1d8ab186c
(cherry picked from commit f4885adc18 )
2016-09-26 22:10:07 -07:00
Tao Bao and android-build-merger
2fdc9c84f6
Merge "Duplicate the last_install content into last_log." am: 95afc912fb am: 5ac819a51f am: c064b01898
...
am: 4b17a18f11
Change-Id: I723858e18b516f0b77fa6d5c78dec73556c23e13
2016-09-27 02:35:06 +00:00
Tao Bao and android-build-merger
e07fa3191b
resolve merge conflicts of bfee61b to nyc-mr1-dev-plus-aosp
...
am: b0aea15c03
Change-Id: I827025338d03359e4202233cc072829655b7c2b3
2016-09-27 02:34:56 +00:00
Tao Bao and android-build-merger
4b17a18f11
Merge "Duplicate the last_install content into last_log." am: 95afc912fb am: 5ac819a51f
...
am: c064b01898
Change-Id: Ibf8e3f164edf4cf90d87a4c608f269ca697d3ca4
2016-09-27 02:03:40 +00:00
Tao Bao
b0aea15c03
resolve merge conflicts of bfee61b to nyc-mr1-dev-plus-aosp
...
Change-Id: I30660f468c9b4d99ec51d5973e3733d892cb763c
2016-09-26 18:55:15 -07:00
Tao Bao and android-build-merger
c064b01898
Merge "Duplicate the last_install content into last_log." am: 95afc912fb
...
am: 5ac819a51f
Change-Id: I9449ecabc6b367fe71244fc8751993d89e2b1dc7
2016-09-27 01:45:20 +00:00
Tao Bao and android-build-merger
bfee61bf28
Duplicate the last_install content into last_log. am: f4885adc18
...
am: 87f4edf467
Change-Id: I7c28f25f07d0f1c1df41e771c28baaa813b0a44a
2016-09-27 01:45:12 +00:00
Tao Bao and android-build-merger
5ac819a51f
Merge "Duplicate the last_install content into last_log."
...
am: 95afc912fb
Change-Id: Ib3838e9d2f3d6a9a15872e9a5163bf140ff2f3d5
2016-09-27 01:43:42 +00:00
Tao Bao and android-build-merger
87f4edf467
Duplicate the last_install content into last_log.
...
am: f4885adc18
Change-Id: I8f197d09af405254a0b07f0ace4e5149736ca0ad
2016-09-27 01:43:41 +00:00
Tao Bao and Gerrit Code Review
95afc912fb
Merge "Duplicate the last_install content into last_log."
2016-09-27 01:38:53 +00:00
Tao Bao and android-build-merger
f889a4ecd6
Merge "Duplicate the last_install content into last_log." into nyc-mr1-dev-plus-aosp
...
am: e8d7b84a25
Change-Id: Ic9a32d066ce0abbb4e895624bc977d311fe2cdb5
2016-09-26 22:20:16 +00:00
Tao Bao and android-build-merger
13414c6a04
Duplicate the last_install content into last_log.
...
am: badaac45fe
Change-Id: Iabe0a6f9530e671159e64dbacf455b57ac9eda32
2016-09-26 22:20:15 +00:00
Tao Bao and Android (Google) Code Review
e8d7b84a25
Merge "Duplicate the last_install content into last_log." into nyc-mr1-dev-plus-aosp
2016-09-26 22:07:00 +00:00
Tao Bao
badaac45fe
Duplicate the last_install content into last_log.
...
Currently we save the OTA metrics in last_install, which keeps the data
for the _last_ install only. This CL logs the same content into last_log
so that we keep the metrics for every install.
Bug: 31607469
Test: Apply an update (via OTA and sideload) and check last_log and last_install.
Change-Id: Id8f174d79534fddc9f06d72a4e69b2b1d8ab186c
(cherry picked from commit f4885adc18 )
2016-09-26 14:56:25 -07:00
Tao Bao
f4885adc18
Duplicate the last_install content into last_log.
...
Currently we save the OTA metrics in last_install, which keeps the data
for the _last_ install only. This CL logs the same content into last_log
so that we keep the metrics for every install.
Bug: 31607469
Test: Apply an update (via OTA and sideload) and check last_log and last_install.
Change-Id: Id8f174d79534fddc9f06d72a4e69b2b1d8ab186c
2016-09-26 14:46:12 -07:00
Elliott Hughes and android-build-merger
91fb2816a4
resolve merge conflicts of d5c7d6b to nyc-mr1-dev-plus-aosp
...
am: 130f6c86f5
Change-Id: I78fc8627c3fc3701f1a34ae1038d96a7df2e6e18
2016-09-26 20:21:49 +00:00
Elliott Hughes
130f6c86f5
resolve merge conflicts of d5c7d6b to nyc-mr1-dev-plus-aosp
...
Change-Id: Ia041044547351a3e65b647bb9913aa18c7d2c97c
2016-09-26 12:53:52 -07:00