Replacing Brillo Error
Creating our own error struct to remove libchrome dependancy. This also
allows us to propogate the error up and send more useful error messages
Test: m update_engine
Change-Id: I1bb651d9b7e759c9f902590685c1910b97c4ab5d
diff --git a/aosp/binder_service_android_common.h b/aosp/binder_service_android_common.h
index 5e137b9..eb3588d 100644
--- a/aosp/binder_service_android_common.h
+++ b/aosp/binder_service_android_common.h
@@ -20,16 +20,16 @@
#include <string>
#include <vector>
-#include "brillo/errors/error.h"
+#include "update_engine/common/error.h"
#include <binder/Status.h>
namespace chromeos_update_engine {
-static inline android::binder::Status ErrorPtrToStatus(
- const brillo::ErrorPtr& error) {
+static inline android::binder::Status ErrorPtrToStatus(const Error& error) {
return android::binder::Status::fromServiceSpecificError(
- 1, android::String8{error->GetMessage().c_str()});
+ static_cast<int>(error.error_code),
+ android::String8{error.message.c_str()});
}
static inline std::vector<std::string> ToVecString(