| commit | 23f525ff9d9c6b31d609da3541da57090a85b8cc | [log] [tgz] |
|---|---|---|
| author | Yifan Hong <elsk@google.com> | Fri Aug 07 20:45:12 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 07 20:45:12 2020 +0000 |
| tree | 4df0f6b795c2a3c9a1434d4525176a5321a14ff0 | |
| parent | d66d60ea4032b8e588a518361d509022f7c88448 [diff] | |
| parent | 6eaa5103c22ef86c6810c6a78d2b3a7c48a57b62 [diff] |
update_engine_stable_android: Use noreturn am: 5d7a1de410 am: 783be0bd53 am: 6eaa5103c2 Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1393752 Change-Id: I5ddd6573d86a554f9f0eee041490e748affd2b4d
diff --git a/stable/update_engine_stable_client.cc b/stable/update_engine_stable_client.cc index c466c42..da203c4 100644 --- a/stable/update_engine_stable_client.cc +++ b/stable/update_engine_stable_client.cc
@@ -50,10 +50,9 @@ "", "A list of key-value pairs, one element of the list per line."); -int Exit(int return_code) { +[[noreturn]] int Exit(int return_code) { LOG(INFO) << "Exit: " << return_code; exit(return_code); - __builtin_unreachable(); } // Called whenever the UpdateEngine daemon dies. void UpdateEngineServiceDied(void*) { @@ -98,7 +97,6 @@ Exit((code == ErrorCode::kSuccess || code == ErrorCode::kUpdatedButNotActive) ? EX_OK : EX_SOFTWARE); - __builtin_unreachable(); } int UpdateEngineClientAndroid::Run() {