summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Anderson <saa@android.com>2012-02-15 15:44:39 -0800
committerScott Anderson <saa@android.com>2012-02-15 16:57:59 -0800
commiteec2bb9fda7772d8927603a29ca0880b8b10a8ed (patch)
tree2fdb9d4939571f4d631ba5d026089695d9da109a
parent91c8ffbac348ed4ca9a401d80beb9f24c6086361 (diff)
downloadextras-eec2bb9fda7772d8927603a29ca0880b8b10a8ed.tar.gz
ext4_utils: Fix LOCAL_MODULE_TAGS on img2simg and simg2img
There were a few problems with the LOCAL_MODULE_TAGS here: 1) simg2img was being installed on the device. Add an "optional" tag for the BUILD_EXECUTABLE from the implied default of user so this does not happen. 2) In preparation of removing simg2img from user_tags.mk, add a "debug" tag to the BUILD_HOST_EXECUTABLE so it will be put in the host bin subdirectory for eng and userdebug builds. 3) img2simg was not being put into the host bin subdirectory by default. By changing the TAG from optional to debug, it is now put there for eng and userdebug builds. Change-Id: I3182781e78ffde2208644660d33b7eb068147561 Signed-off-by: Scott Anderson <saa@android.com>
-rw-r--r--ext4_utils/Android.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/ext4_utils/Android.mk b/ext4_utils/Android.mk
index ab0f26b2..ddf74cfb 100644
--- a/ext4_utils/Android.mk
+++ b/ext4_utils/Android.mk
@@ -84,6 +84,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := simg2img.c \
sparse_crc32.c
LOCAL_MODULE := simg2img
+LOCAL_MODULE_TAGS := debug
include $(BUILD_HOST_EXECUTABLE)
@@ -92,6 +93,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := simg2img.c \
sparse_crc32.c
LOCAL_MODULE := simg2img
+LOCAL_MODULE_TAGS := optional
include $(BUILD_EXECUTABLE)
@@ -101,7 +103,7 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := img2simg.c
LOCAL_MODULE := img2simg
-LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_TAGS := debug
include $(BUILD_HOST_EXECUTABLE)
endif