dtbhtool: Add LOCAL_MODULE_TAGS := optional

* This breaks building on devices that
  don't require the need of dtbhtool
* Also remove LOCAL_MODULE_TAGS := eng, to
  avoid requiring this on an eng build

Change-Id: Iad9296f46dd78c778ce1ce48d6722ed98bc27cd3
Signed-off-by: Paul Keith <javelinanddart@gmail.com>

dtbhtool/Android.mk

@@ -7,6 +7,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/libfdt
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/libdtbimg
 
 LOCAL_MODULE := libdtbimg
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_STATIC_LIBRARY)
 
@@ -16,12 +17,14 @@ LOCAL_SRC_FILES := mkbootimg.c
 LOCAL_STATIC_LIBRARIES := libdtbimg libfdt libmincrypt
 
 LOCAL_MODULE := mkdtbhbootimg
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_EXECUTABLE)
 
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := unpackbootimg.c
 LOCAL_MODULE := unpackdtbhbootimg
+LOCAL_MODULE_TAGS := optional
 include $(BUILD_HOST_EXECUTABLE)
 
 include $(CLEAR_VARS)
@@ -30,6 +33,7 @@ LOCAL_SRC_FILES := mkdtbimg.c
 LOCAL_STATIC_LIBRARIES := libdtbimg libfdt
 
 LOCAL_MODULE := dtbhtoolExynos
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_EXECUTABLE)
 
@@ -37,7 +41,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := mkbootimg.c
 LOCAL_STATIC_LIBRARIES := libdtbimg libfdt libmincrypt libcutils libc
 LOCAL_MODULE := utility_mkdtbhbootimg
-LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_STEM := mkdtbhbootimg
 LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES
 LOCAL_UNSTRIPPED_PATH := $(PRODUCT_OUT)/symbols/utilities
@@ -49,7 +53,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := unpackbootimg.c
 LOCAL_STATIC_LIBRARIES := libcutils libc
 LOCAL_MODULE := utility_unpackdtbhbootimg
-LOCAL_MODULE_TAGS := eng
+LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_STEM := unpackdtbhbootimg
 LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES
 LOCAL_UNSTRIPPED_PATH := $(PRODUCT_OUT)/symbols/utilities

dtbhtool/libfdt/Android.mk

@@ -10,6 +10,7 @@ LOCAL_SRC_FILES := fdt.c \
     fdt_wip.c
 
 LOCAL_MODULE := libfdt
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_STATIC_LIBRARY)
 
@@ -23,5 +24,6 @@ LOCAL_SRC_FILES := fdt.c \
     fdt_wip.c
 
 LOCAL_MODULE := libfdt
+LOCAL_MODULE_TAGS := optional
 
-include $(BUILD_STATIC_LIBRARY)
+include $(BUILD_STATIC_LIBRARY)