Move error_code.h into otautil.
This way it stops requiring relative path ".." in LOCAL_C_INCLUDES
(uncrypt and edify). Soong doesn't accept non-local ".." in
"local_include_dirs".
Test: mmma bootable/recovery
Change-Id: Ia4649789cef2aaeb2785483660e9ea5a8b389c62
diff --git a/edify/Android.mk b/edify/Android.mk
index cec65f4..db7b5b6 100644
--- a/edify/Android.mk
+++ b/edify/Android.mk
@@ -30,7 +30,8 @@
LOCAL_CPPFLAGS := -Wno-unused-parameter
LOCAL_CPPFLAGS += -Wno-deprecated-register
LOCAL_MODULE := libedify
-LOCAL_C_INCLUDES += $(LOCAL_PATH)/..
-LOCAL_STATIC_LIBRARIES += libbase
+LOCAL_STATIC_LIBRARIES += \
+ libotautil \
+ libbase
include $(BUILD_STATIC_LIBRARY)
diff --git a/edify/expr.h b/edify/expr.h
index 4838d20..f2a4d6d 100644
--- a/edify/expr.h
+++ b/edify/expr.h
@@ -23,7 +23,7 @@
#include <string>
#include <vector>
-#include "error_code.h"
+#include "otautil/error_code.h"
struct State {
State(const std::string& script, void* cookie);