Tianjie Xu
1e28fd0bc2
Merge "Disable building simulator for mac" am: f3dd821f76 am: 3489b274d0 am: b93dc08bc6
...
am: 0f379730f2
Change-Id: I8cd1a622d26916a79d70a79855caa3b2c2427640
2019-05-30 14:58:31 -07:00
Tianjie Xu
0f379730f2
Merge "Disable building simulator for mac" am: f3dd821f76 am: 3489b274d0
...
am: b93dc08bc6
Change-Id: I1b191e246349299a381ee5cec9bf15fad99bea5c
2019-05-30 14:28:26 -07:00
Tianjie Xu
b93dc08bc6
Merge "Disable building simulator for mac" am: f3dd821f76
...
am: 3489b274d0
Change-Id: Idfe10693ecc07e4721bf32e1a7a914feb69f2dec
2019-05-30 14:17:05 -07:00
Tianjie Xu
3489b274d0
Merge "Disable building simulator for mac"
...
am: f3dd821f76
Change-Id: Iccdde0099a51184fce6f86f9b7ad3f62ce33b36e
2019-05-30 14:08:32 -07:00
Treehugger Robot
f3dd821f76
Merge "Disable building simulator for mac"
2019-05-30 20:45:28 +00:00
Tianjie Xu
76e165d143
Disable building simulator for mac
...
Disable building the simulator and its support libraries to resolve the breakage
on mac host targets. Because the simulator is not intended to use on mac anyway.
Bug: 134047992
Test: mma
Change-Id: I488ab50cab1282f03250010b5334f1895d44f98b
2019-05-30 10:49:18 -07:00
Tianjie Xu
96fa6831f4
Merge "Implement an update simulator to verify BB OTA packages on host" am: 65d7d5b8cf am: 29d9d7bbbe am: 55e82e2fc5
...
am: 36ca5abd94
Change-Id: Ia4e28377354bc96256ff24c6de8a853f3d4442e7
2019-05-29 11:18:30 -07:00
Tianjie Xu
36ca5abd94
Merge "Implement an update simulator to verify BB OTA packages on host" am: 65d7d5b8cf am: 29d9d7bbbe
...
am: 55e82e2fc5
Change-Id: I67b8152c41b2e92a67f935488f631bff7f5cf6ee
2019-05-29 10:48:39 -07:00
Tianjie Xu
55e82e2fc5
Merge "Implement an update simulator to verify BB OTA packages on host" am: 65d7d5b8cf
...
am: 29d9d7bbbe
Change-Id: Id0152ae0ef3b12501e67e9f3404bd2a379b79c7e
2019-05-29 10:44:17 -07:00
Tianjie Xu
29d9d7bbbe
Merge "Implement an update simulator to verify BB OTA packages on host"
...
am: 65d7d5b8cf
Change-Id: Ie3d3af1442c75563c10a9c6c2991426f1054305d
2019-05-29 10:37:34 -07:00
Tianjie Xu
65d7d5b8cf
Merge "Implement an update simulator to verify BB OTA packages on host"
2019-05-29 17:20:36 +00:00
Tianjie Xu
c1a5e26fd9
Implement an update simulator to verify BB OTA packages on host
...
Implement the simulator runtime and build the updater simulator as a host
executable. The code to parse the target-files and mocks the block devices
will be submitted in the follow-up.
Bug: 131911365
Test: unit tests pass
Change-Id: Ib1ba939aec8333ca68a45139514d772ad7a27ad8
2019-05-28 15:18:25 -07:00
Mark Salyzyn
8bca107758
Merge "recovery: report compliant reboot reason (Part Deux)" am: c0a51a01ce am: 7d0545f14a am: 3447708800
...
am: 7b2ca7f88b
Change-Id: Id352f6c8acfe6b406f21ebba1dd20bd075729f62
2019-05-28 09:35:00 -07:00
Mark Salyzyn
7b2ca7f88b
Merge "recovery: report compliant reboot reason (Part Deux)" am: c0a51a01ce am: 7d0545f14a
...
am: 3447708800
Change-Id: I564c87f50d3a4a8ad6a26a16e96586e2ef235ca5
2019-05-28 09:27:54 -07:00
Mark Salyzyn
3447708800
Merge "recovery: report compliant reboot reason (Part Deux)" am: c0a51a01ce
...
am: 7d0545f14a
Change-Id: I5818816fc88d05e2b8b4fa7fec17a009f854e1f9
2019-05-28 09:22:53 -07:00
Mark Salyzyn
7d0545f14a
Merge "recovery: report compliant reboot reason (Part Deux)"
...
am: c0a51a01ce
Change-Id: Ie92bd6205de683781a9a315657485cd232682de3
2019-05-28 09:17:51 -07:00
Treehugger Robot
c0a51a01ce
Merge "recovery: report compliant reboot reason (Part Deux)"
2019-05-28 15:57:24 +00:00
Tianjie Xu
e255db34b1
Merge "Some clean ups to the updater" am: 52e61f6995 am: a0c0e04163 am: e89cfb6a41
...
am: bcade69f45
Change-Id: I49da90d03a26aa77b29ba7989e628566bfc41134
2019-05-24 11:46:51 -07:00
Tao Bao
e6b01a20ad
[automerger skipped] Add misc_writer. am: 35e0f6d290 -s ours am: 865c17893b -s ours
...
am: 1406a210e6 -s ours
am skip reason: change_id I79548fc63fc79b705a0320868690569c3106949f with SHA1 35e0f6d290 is in history
Change-Id: I30f72535a86e9b076467746bf9cc112c30c02317
2019-05-24 10:02:03 -07:00
Tao Bao
5f9c1c6a28
[automerger skipped] Add misc_writer. am: 35e0f6d290 am: af0a76d1c5 -s ours
...
am: 29f9d20f93 -s ours
am skip reason: change_id I79548fc63fc79b705a0320868690569c3106949f with SHA1 7ae0169842 is in history
Change-Id: I902181557ecf3328123438c1bfd7dbcd7871da38
2019-05-24 05:15:51 -07:00
Elliott Hughes
c99cc0bd7d
Merge "Move off the Next ZipString overload." am: 7b67d28518 am: 505ed45940 am: ee57256055
...
am: 50b4e59890
Change-Id: Iee020cd879d088b949c6caa5edbf9a0d094c932c
2019-05-24 01:24:42 -07:00
Tianjie Xu
bcade69f45
Merge "Some clean ups to the updater" am: 52e61f6995 am: a0c0e04163
...
am: e89cfb6a41
Change-Id: Ia233f613e14c3902aae49347a001fa0b83250dd1
2019-05-24 01:07:44 -07:00
Tianjie Xu
e89cfb6a41
Merge "Some clean ups to the updater" am: 52e61f6995
...
am: a0c0e04163
Change-Id: I0095c2eb465559d30632d00d1a18b6d6b5eda143
2019-05-23 23:08:07 -07:00
Tianjie Xu
a0c0e04163
Merge "Some clean ups to the updater"
...
am: 52e61f6995
Change-Id: I515d9cd9cf0d3b82fd2a28ccfcef8e2eea1e5683
2019-05-23 22:44:44 -07:00
Tianjie Xu
52e61f6995
Merge "Some clean ups to the updater"
2019-05-24 04:45:43 +00:00
Tao Bao
ce1bfd3440
Merge "Revert "recovery: report compliant reboot reason"" am: 44f6b182dd am: b491496fc3 am: 863c8f36dd
...
am: 7c151865d6
Change-Id: Ie43cba23d466d7e8ca403c349e20b602fe7cba09
2019-05-23 17:33:12 -07:00
Tao Bao
1406a210e6
[automerger skipped] Add misc_writer. am: 35e0f6d290 -s ours
...
am: 865c17893b -s ours
am skip reason: change_id I79548fc63fc79b705a0320868690569c3106949f with SHA1 35e0f6d290 is in history
Change-Id: I3e8b8b1a2f99e3a1e58bd9c1a58cc909b20e97b8
2019-05-23 14:28:58 -07:00
Mark Salyzyn
488cc05c96
recovery: report compliant reboot reason (Part Deux)
...
shutdown and reboot should have a corresponding sub-reason.
Adding:
"reboot,userrequested,fastboot"
"reboot,userrequested,recovery"
"reboot,userrequested,recovery,ui"
"shutdown,userrequested,fastboot"
"shutdown,userrequested,recovery"
"reboot,unknown#" (Can't happen, debug)
Test: manual, multiple targets, enter recovery, be able to exit recovery
Bug: 133326470
Change-Id: Ibfcb2a23158e8e99922e8053edd815fb592150f2
2019-05-23 13:58:53 -07:00
Tao Bao
29f9d20f93
[automerger skipped] Add misc_writer. am: 35e0f6d290
...
am: af0a76d1c5 -s ours
am skip reason: change_id I79548fc63fc79b705a0320868690569c3106949f with SHA1 7ae0169842 is in history
Change-Id: I9e0d5d1539699cab1b073f5da0a7db54b8fbaefe
2019-05-23 13:54:08 -07:00
Elliott Hughes
50b4e59890
Merge "Move off the Next ZipString overload." am: 7b67d28518 am: 505ed45940
...
am: ee57256055
Change-Id: I0d6131d183a52a9c7fd54c5a00926d99cf6c408d
2019-05-23 13:50:12 -07:00
Tao Bao
865c17893b
[automerger skipped] Add misc_writer.
...
am: 35e0f6d290 -s ours
am skip reason: change_id I79548fc63fc79b705a0320868690569c3106949f with SHA1 7ae0169842 is in history
Change-Id: I092c0920b4e9bb4f9386ec84b7522bfbb984477b
2019-05-23 13:37:06 -07:00
Tao Bao
af0a76d1c5
Add misc_writer.
...
am: 35e0f6d290
Change-Id: I4c9c9db09280a0e492cf832489b48511728413b4
2019-05-23 13:26:11 -07:00
Elliott Hughes
ee57256055
Merge "Move off the Next ZipString overload." am: 7b67d28518
...
am: 505ed45940
Change-Id: I1543b8adc9872333c5a6dbcad001cc2387877816
2019-05-23 13:10:12 -07:00
Elliott Hughes
505ed45940
Merge "Move off the Next ZipString overload."
...
am: 7b67d28518
Change-Id: Idbc570cc79fd3d620e2f3544b90cffb43139b6bc
2019-05-23 11:23:36 -07:00
Elliott Hughes
7b67d28518
Merge "Move off the Next ZipString overload."
2019-05-23 17:55:27 +00:00
Tao Bao
7c151865d6
Merge "Revert "recovery: report compliant reboot reason"" am: 44f6b182dd am: b491496fc3
...
am: 863c8f36dd
Change-Id: Ic736642d61adb472aa1b4984cc8e335f5c8d7207
2019-05-23 01:09:20 -07:00
Tao Bao
863c8f36dd
Merge "Revert "recovery: report compliant reboot reason"" am: 44f6b182dd
...
am: b491496fc3
Change-Id: Ib108dd6d1bbda2f03a3730c58519e42b5dd59766
2019-05-22 21:18:45 -07:00
Elliott Hughes
88d8001e75
Move off the Next ZipString overload.
...
Bug: http://b/129068177
Test: treehugger
Change-Id: I3c8f70b0d8cc5dc6b3b4439dbe0b9a5bd85003c4
2019-05-22 18:52:29 -07:00
Tao Bao
b491496fc3
Merge "Revert "recovery: report compliant reboot reason""
...
am: 44f6b182dd
Change-Id: I37bfc2cac926a3b3aaecad4807478e5aed9f51aa
2019-05-22 18:52:21 -07:00
Tianjie Xu
27556d089f
Some clean ups to the updater
...
Remove some unnecessary includes or forward declarations. And include
the correct headers to build host executables.
Bug: 131911365
Test: unit tests pass
Change-Id: I62e75f60678159fe24619a4bd386b1416f1a5b5d
2019-05-22 14:58:28 -07:00
Treehugger Robot
44f6b182dd
Merge "Revert "recovery: report compliant reboot reason""
2019-05-22 21:55:38 +00:00
Tao Bao
feefbf2f56
Revert "recovery: report compliant reboot reason"
...
This reverts commit 6f4e4db4f9 .
Reason for revert: Booting out of recovery (choose `Reboot system now`)
on taimen is broken. Device keeps booting back into recovery.
Bug: 133326470
Test: Choose `Reboot system now` from recovery menu. Deivce attempts
normal boot.
Change-Id: I6e85fc248e18953a6fb94513c3abc7e7e0fb0477
2019-05-22 11:06:26 -07:00
Mark Salyzyn
0f677e6d96
Merge "recovery: report compliant reboot reason" am: d31fb2e7fc am: c3042973a4 am: d77641069e
...
am: c812d98b64
Change-Id: Ib0a60bcc1d48baa811f1e08e0d7f3e86a3ed3197
2019-05-21 21:35:03 -07:00
Tianjie Xu
3a961fa48c
Merge "Add UpdaterRuntime class" am: e7b3c5698e am: c6d7065880 am: 3445bf5352
...
am: cba91383f7
Change-Id: I44cc8652020bccd896e481f52aa439277206c87c
2019-05-21 17:54:23 -07:00
Mark Salyzyn
c812d98b64
Merge "recovery: report compliant reboot reason" am: d31fb2e7fc am: c3042973a4
...
am: d77641069e
Change-Id: I1a5afef9ce6ff46cbf89d458e1ec52d916da630c
2019-05-21 15:59:34 -07:00
Tianjie Xu
cba91383f7
Merge "Add UpdaterRuntime class" am: e7b3c5698e am: c6d7065880
...
am: 3445bf5352
Change-Id: Iee5015a8c6c6c86c6a3dd5516cc48afd02c7874d
2019-05-21 15:55:25 -07:00
Mark Salyzyn
d77641069e
Merge "recovery: report compliant reboot reason" am: d31fb2e7fc
...
am: c3042973a4
Change-Id: I020798a035fa83839347f821dbfad1d363ec5d69
2019-05-21 13:32:30 -07:00
Tianjie Xu
3445bf5352
Merge "Add UpdaterRuntime class" am: e7b3c5698e
...
am: c6d7065880
Change-Id: I4096ef9a51904b5ecd889bda5ff0d9e11acb4071
2019-05-21 13:25:31 -07:00
Mark Salyzyn
c3042973a4
Merge "recovery: report compliant reboot reason"
...
am: d31fb2e7fc
Change-Id: I7105c56c65f8d2573ec8e0b7cada81468ccef2b7
2019-05-21 11:57:57 -07:00
Tianjie Xu
c6d7065880
Merge "Add UpdaterRuntime class"
...
am: e7b3c5698e
Change-Id: I2942823be107f1e693385a7892251519ac50afb1
2019-05-21 11:57:32 -07:00