diff options
author | JP Abgrall <jpa@google.com> | 2014-06-25 15:05:37 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-25 15:05:37 +0000 |
commit | f4fca2d557337f739fdc1617816a3f7d45c0a124 (patch) | |
tree | befab4b0c031626efaaf95d43707ec40665ceaf7 | |
parent | e36eaf9d3c84b381d3d6556efc00a454eb0d69e8 (diff) | |
parent | 2dd33a8f11b320fc5decd5de57730ab4a1d3aaa4 (diff) | |
download | extras-f4fca2d557337f739fdc1617816a3f7d45c0a124.tar.gz |
am 2dd33a8f: Merge "f2fs_utils: make Mac builds happy (copy out mkf2fsuserimg.sh)"
* commit '2dd33a8f11b320fc5decd5de57730ab4a1d3aaa4':
f2fs_utils: make Mac builds happy (copy out mkf2fsuserimg.sh)
-rw-r--r-- | f2fs_utils/Android.mk | 3 |
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 |