From 623fe7e701d5d0fb17082d1ced14498af1b44e5b Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Mon, 2 Oct 2017 16:28:06 -0700 Subject: 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 --- applypatch/Android.mk | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'applypatch') diff --git a/applypatch/Android.mk b/applypatch/Android.mk index f5dda2bc4..f02957e7e 100644 --- a/applypatch/Android.mk +++ b/applypatch/Android.mk @@ -30,6 +30,7 @@ LOCAL_C_INCLUDES := \ LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_STATIC_LIBRARIES := \ libotafault \ + libotautil \ libbase \ libcrypto \ libbspatch \ @@ -53,6 +54,7 @@ LOCAL_C_INCLUDES := \ bootable/recovery LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_STATIC_LIBRARIES := \ + libotautil \ libcrypto \ libbspatch \ libbase \ @@ -77,6 +79,7 @@ LOCAL_C_INCLUDES := \ bootable/recovery LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_STATIC_LIBRARIES := \ + libotautil \ libcrypto \ libbspatch \ libbase \ @@ -99,6 +102,7 @@ LOCAL_STATIC_LIBRARIES := \ libapplypatch \ libbase \ libedify \ + libotautil \ libcrypto LOCAL_CFLAGS := -Wall -Werror include $(BUILD_STATIC_LIBRARY) @@ -114,6 +118,7 @@ LOCAL_STATIC_LIBRARIES := \ libapplypatch \ libedify \ libotafault \ + libotautil \ libbspatch \ libbase \ libziparchive \ -- cgit v1.2.3