From 1fc5bf353a8719d16fd9ba29a661d211bad4038f Mon Sep 17 00:00:00 2001
From: Tao Bao <tbao@google.com>
Date: Fri, 6 Oct 2017 07:43:41 -0700
Subject: Revert "Revert "Move error_code.h into otautil.""

This reverts commit 26436d6d6010d5323349af7e119ff8f34f85c40c to re-land
"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".

This CL needs to land with device-specific module changes (e.g. adding
the dependency on libotautil).

Test: lunch aosp_{angler,bullhead,dragon,fugu,sailfish}-userdebug;
      mmma bootable/recovery
Change-Id: If193241801af2dae73eccd31ce57cd2b81c9fd96
---
 edify/Android.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'edify/Android.mk')

diff --git a/edify/Android.mk b/edify/Android.mk
index fbf2b1b06..527698e68 100644
--- a/edify/Android.mk
+++ b/edify/Android.mk
@@ -30,8 +30,9 @@ LOCAL_CFLAGS := -Wall -Werror
 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)
 
-- 
cgit v1.2.3