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_stable_android.cc b/aosp/binder_service_stable_android.cc
index 17b35ee..9a9969d 100644
--- a/aosp/binder_service_stable_android.cc
+++ b/aosp/binder_service_stable_android.cc
@@ -21,7 +21,6 @@
#include <base/bind.h>
#include <base/logging.h>
#include <binderwrapper/binder_wrapper.h>
-#include <brillo/errors/error.h>
#include <utils/String8.h>
#include "update_engine/aosp/binder_service_android_common.h"
@@ -111,7 +110,7 @@
const vector<android::String16>& header_kv_pairs) {
vector<string> str_headers = ToVecString(header_kv_pairs);
- brillo::ErrorPtr error;
+ Error error;
if (!service_delegate_->ApplyPayload(
pfd.get(), payload_offset, payload_size, str_headers, &error)) {
return ErrorPtrToStatus(error);