summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJP Abgrall <jpa@google.com>2014-06-25 18:46:56 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-25 18:46:56 +0000
commit87331e11deec4ad4a40cf0160b16deac8b4420da (patch)
treecd80f03867f1e5a2cc69598f9129106e046fcee1
parent65be6c1daa6a56b11a35d0350ddfbae4c535dc9d (diff)
parentf4fca2d557337f739fdc1617816a3f7d45c0a124 (diff)
downloadextras-87331e11deec4ad4a40cf0160b16deac8b4420da.tar.gz
am f4fca2d5: am 2dd33a8f: Merge "f2fs_utils: make Mac builds happy (copy out mkf2fsuserimg.sh)"
* commit 'f4fca2d557337f739fdc1617816a3f7d45c0a124': f2fs_utils: make Mac builds happy (copy out mkf2fsuserimg.sh)
-rw-r--r--f2fs_utils/Android.mk3
1 files changed, 2 insertions, 1 deletions
diff --git a/f2fs_utils/Android.mk b/f2fs_utils/Android.mk
index 60fe081a..080606ea 100644
--- a/f2fs_utils/Android.mk
+++ b/f2fs_utils/Android.mk
@@ -67,6 +67,8 @@ LOCAL_STATIC_LIBRARIES := \
libsparse_static
include $(BUILD_STATIC_LIBRARY)
+endif
+
include $(CLEAR_VARS)
LOCAL_MODULE := mkf2fsuserimg.sh
LOCAL_SRC_FILES := mkf2fsuserimg.sh
@@ -77,5 +79,4 @@ LOCAL_BUILT_MODULE_STEM := $(notdir $(LOCAL_SRC_FILES))
LOCAL_IS_HOST_MODULE := true
include $(BUILD_PREBUILT)
-endif