From cdbd3b6c89d3124c659904c8385b0c4a2d086eb9 Mon Sep 17 00:00:00 2001 From: "Christopher N. Hesse" Date: Tue, 17 Jan 2017 00:19:01 +0100 Subject: [PATCH] Revert "dtbhtool: Add LOCAL_MODULE_TAGS := optional" Superflous commit, see: http://source.android.com/source/add-device.html. This reverts commit 7598a16084a6aa1f708bea3c6448f824f73db851. Change-Id: I75af8b68b8dc07a27d1bc2bf23550f3c1c8ddb77 --- dtbhtool/Android.mk | 8 ++------ dtbhtool/libfdt/Android.mk | 4 +--- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dtbhtool/Android.mk b/dtbhtool/Android.mk index d2d346df..d4bad52a 100644 --- a/dtbhtool/Android.mk +++ b/dtbhtool/Android.mk @@ -7,7 +7,6 @@ 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) @@ -17,14 +16,12 @@ 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) @@ -33,7 +30,6 @@ LOCAL_SRC_FILES := mkdtbimg.c LOCAL_STATIC_LIBRARIES := libdtbimg libfdt LOCAL_MODULE := dtbhtoolExynos -LOCAL_MODULE_TAGS := optional include $(BUILD_HOST_EXECUTABLE) @@ -41,7 +37,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := mkbootimg.c LOCAL_STATIC_LIBRARIES := libdtbimg libfdt libmincrypt libcutils libc LOCAL_MODULE := utility_mkdtbhbootimg -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TAGS := eng LOCAL_MODULE_STEM := mkdtbhbootimg LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES LOCAL_UNSTRIPPED_PATH := $(PRODUCT_OUT)/symbols/utilities @@ -53,7 +49,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := unpackbootimg.c LOCAL_STATIC_LIBRARIES := libcutils libc LOCAL_MODULE := utility_unpackdtbhbootimg -LOCAL_MODULE_TAGS := optional +LOCAL_MODULE_TAGS := eng LOCAL_MODULE_STEM := unpackdtbhbootimg LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES LOCAL_UNSTRIPPED_PATH := $(PRODUCT_OUT)/symbols/utilities diff --git a/dtbhtool/libfdt/Android.mk b/dtbhtool/libfdt/Android.mk index 7c19a059..8c620347 100644 --- a/dtbhtool/libfdt/Android.mk +++ b/dtbhtool/libfdt/Android.mk @@ -10,7 +10,6 @@ LOCAL_SRC_FILES := fdt.c \ fdt_wip.c LOCAL_MODULE := libfdt -LOCAL_MODULE_TAGS := optional include $(BUILD_HOST_STATIC_LIBRARY) @@ -24,6 +23,5 @@ LOCAL_SRC_FILES := fdt.c \ fdt_wip.c LOCAL_MODULE := libfdt -LOCAL_MODULE_TAGS := optional -include $(BUILD_STATIC_LIBRARY) +include $(BUILD_STATIC_LIBRARY) \ No newline at end of file