| commit | 783be0bd530e5262c652d2bfc040989721ed04d3 | [log] [tgz] |
|---|---|---|
| author | Yifan Hong <elsk@google.com> | Fri Aug 07 20:07:21 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Aug 07 20:07:21 2020 +0000 |
| tree | 4329e69cb6a3f672c92c956bc97cb6c7fdcae265 | |
| parent | 0f66ef5d8cfe0062ee4021625ba5e82cdea10dde [diff] | |
| parent | 5d7a1de410f98011b18306c679eec2cf29cda85f [diff] |
update_engine_stable_android: Use noreturn am: 5d7a1de410 Original change: https://android-review.googlesource.com/c/platform/system/update_engine/+/1393752 Change-Id: I74bc13fe3583b3881ffe21f2f7ec9c883abd6802
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() {