system/corennnnn
| Revision | 39bb7f4522e9ad960b2fb72d23a6bdb3a754aebb (tree) |
|---|---|
| Zeit | 2016-09-09 08:04:01 |
| Autor | Keith Mok <kmok@cyng...> |
| Commiter | Keith Mok |
fastboot: format f2fs partition instead of just erase
When doing fastboot -w on Darwin for f2fs partitions,
it only erase it without format it due to a flag not set in Android.mk
Change-Id: I642672467d68c75915900bb88c9aa86571140e03
fastboot/Android.mk (diff)| @@ -69,13 +69,15 @@ LOCAL_STATIC_LIBRARIES := \ | ||
| 69 | 69 | libcutils \ |
| 70 | 70 | libgtest_host \ |
| 71 | 71 | |
| 72 | +ifneq (,$(filter linux darwin,$(HOST_OS))) | |
| 72 | 73 | # libf2fs_dlutils_host will dlopen("libf2fs_fmt_host_dyn") |
| 73 | -LOCAL_CFLAGS_linux := -DUSE_F2FS | |
| 74 | -LOCAL_LDFLAGS_linux := -ldl -rdynamic -Wl,-rpath,. | |
| 75 | -LOCAL_REQUIRED_MODULES_linux := libf2fs_fmt_host_dyn | |
| 74 | +LOCAL_CFLAGS += -DUSE_F2FS | |
| 75 | +LOCAL_LDFLAGS += -ldl -rdynamic -Wl,-rpath,. | |
| 76 | +LOCAL_REQUIRED_MODULES := libf2fs_fmt_host_dyn | |
| 76 | 77 | # The following libf2fs_* are from system/extras/f2fs_utils, |
| 77 | 78 | # and do not use code in external/f2fs-tools. |
| 78 | -LOCAL_STATIC_LIBRARIES_linux += libf2fs_utils_host libf2fs_dlutils_host | |
| 79 | +LOCAL_STATIC_LIBRARIES += libf2fs_utils_host libf2fs_dlutils_host | |
| 80 | +endif | |
| 79 | 81 | |
| 80 | 82 | LOCAL_CXX_STL := libc++_static |
| 81 | 83 |
| @@ -87,7 +89,7 @@ LOCAL_SHARED_LIBRARIES := | ||
| 87 | 89 | include $(BUILD_HOST_EXECUTABLE) |
| 88 | 90 | |
| 89 | 91 | my_dist_files := $(LOCAL_BUILT_MODULE) |
| 90 | -ifeq ($(HOST_OS),linux) | |
| 92 | +ifneq (,$(filter linux darwin,$(HOST_OS))) | |
| 91 | 93 | my_dist_files += $(HOST_LIBRARY_PATH)/libf2fs_fmt_host_dyn$(HOST_SHLIB_SUFFIX) |
| 92 | 94 | endif |
| 93 | 95 | $(call dist-for-goals,dist_files sdk win_sdk,$(my_dist_files)) |
Fork