From 5f70b61eecb00aec09f5737c8d96fa04e5652e4e Mon Sep 17 00:00:00 2001 From: "Kevin F. Haggerty" Date: Fri, 5 Jan 2018 09:39:35 -0700 Subject: [PATCH] dtbhtool: Define both host and target libdtbimg * The utilities need it and not defining the target library results in a missing dependency Change-Id: I745d8586a4a2cc5e3b8bdbe4a7e9dc19e1161db6 --- dtbhtool/Android.mk | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dtbhtool/Android.mk b/dtbhtool/Android.mk index 7769e9c9..82094bf5 100644 --- a/dtbhtool/Android.mk +++ b/dtbhtool/Android.mk @@ -1,12 +1,11 @@ LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) +# Host static library +include $(CLEAR_VARS) LOCAL_SRC_FILES := dtbimg.c LOCAL_STATIC_LIBRARIES := libfdt LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/libdtbimg - LOCAL_MODULE := libdtbimg - include $(BUILD_HOST_STATIC_LIBRARY) include $(CLEAR_VARS) @@ -32,6 +31,14 @@ LOCAL_MODULE := dtbhtoolExynos include $(BUILD_HOST_EXECUTABLE) +# Target static library +include $(CLEAR_VARS) +LOCAL_SRC_FILES := dtbimg.c +LOCAL_STATIC_LIBRARIES := libfdt +LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/libdtbimg +LOCAL_MODULE := libdtbimg +include $(BUILD_STATIC_LIBRARY) + include $(CLEAR_VARS) LOCAL_SRC_FILES := mkbootimg.c LOCAL_STATIC_LIBRARIES := libdtbimg libfdt libcrypto_static libcutils libc