diff options
| author | Jaegeuk Kim <jaegeuk@google.com> | 2017-11-15 10:55:07 -0800 |
|---|---|---|
| committer | Jaegeuk Kim <jaegeuk@google.com> | 2017-11-15 14:22:37 -0800 |
| commit | 8d9b6ee6218b38fbb629df9ee0fdf9a8249394bb (patch) | |
| tree | 62c119542da5ad9e28cf61dcbab38426e9c74c5c /fastboot/Android.mk | |
| parent | b77ecd04d852aacb02eeed20860a498b09d27134 (diff) | |
| download | core-8d9b6ee6218b38fbb629df9ee0fdf9a8249394bb.tar.gz core-8d9b6ee6218b38fbb629df9ee0fdf9a8249394bb.tar.bz2 core-8d9b6ee6218b38fbb629df9ee0fdf9a8249394bb.zip | |
fastboot: make_f2fs call by linux/darwin
Bug: 69298953
Change-Id: I6a7483e8617b649666247c4ca985384d086f15f8
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Diffstat (limited to 'fastboot/Android.mk')
| -rw-r--r-- | fastboot/Android.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fastboot/Android.mk b/fastboot/Android.mk index 7723ec678..b0b23379a 100644 --- a/fastboot/Android.mk +++ b/fastboot/Android.mk @@ -39,7 +39,7 @@ LOCAL_MODULE := fastboot LOCAL_MODULE_TAGS := debug LOCAL_MODULE_HOST_OS := darwin linux windows LOCAL_CFLAGS += -Wall -Wextra -Werror -Wunreachable-code -LOCAL_REQUIRED_MODULES := mke2fs e2fsdroid +LOCAL_REQUIRED_MODULES := mke2fs e2fsdroid make_f2fs LOCAL_SRC_FILES_linux := usb_linux.cpp LOCAL_STATIC_LIBRARIES_linux := libselinux @@ -66,8 +66,6 @@ LOCAL_STATIC_LIBRARIES := \ libcutils \ libgtest_host \ -LOCAL_CFLAGS_linux := -DUSE_F2FS - LOCAL_CXX_STL := libc++_static # Don't add anything here, we don't want additional shared dependencies @@ -80,6 +78,7 @@ include $(BUILD_HOST_EXECUTABLE) my_dist_files := $(LOCAL_BUILT_MODULE) my_dist_files += $(HOST_OUT_EXECUTABLES)/mke2fs$(HOST_EXECUTABLE_SUFFIX) my_dist_files += $(HOST_OUT_EXECUTABLES)/e2fsdroid$(HOST_EXECUTABLE_SUFFIX) +my_dist_files += $(HOST_OUT_EXECUTABLES)/make_f2fs$(HOST_EXECUTABLE_SUFFIX) $(call dist-for-goals,dist_files sdk win_sdk,$(my_dist_files)) ifdef HOST_CROSS_OS # Archive fastboot.exe for win_sdk build. |