diff options
| author | Treehugger Robot | 2018-03-02 14:44:29 -0600 |
|---|---|---|
| committer | Gerrit Code Review | 2018-03-02 14:44:29 -0600 |
| commit | 24efdff2c53aeec6115eac0e3637f6eb5337c6e2 (patch) | |
| tree | e303d304b8abb58b4dcfbdd18d238a11a1db7ede | |
| parent | 3dad67af05205f2c2bebe79d54906f2fe4c377ff (diff) | |
| parent | 5d88aee9c1808e4c600a6fa557e211dc81daecdf (diff) | |
| download | platform-system-core-24efdff2c53aeec6115eac0e3637f6eb5337c6e2.tar.gz platform-system-core-24efdff2c53aeec6115eac0e3637f6eb5337c6e2.tar.xz platform-system-core-24efdff2c53aeec6115eac0e3637f6eb5337c6e2.zip | |
Merge "fastboot: only require Linux modules on Linux"
| -rw-r--r-- | fastboot/Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fastboot/Android.mk b/fastboot/Android.mk index dfcf090b7..f5bcc264d 100644 --- a/fastboot/Android.mk +++ b/fastboot/Android.mk | |||
| @@ -39,13 +39,15 @@ LOCAL_MODULE := fastboot | |||
| 39 | LOCAL_MODULE_TAGS := debug | 39 | LOCAL_MODULE_TAGS := debug |
| 40 | LOCAL_MODULE_HOST_OS := darwin linux windows | 40 | LOCAL_MODULE_HOST_OS := darwin linux windows |
| 41 | LOCAL_CFLAGS += -Wall -Wextra -Werror -Wunreachable-code | 41 | LOCAL_CFLAGS += -Wall -Wextra -Werror -Wunreachable-code |
| 42 | LOCAL_REQUIRED_MODULES := mke2fs e2fsdroid mke2fs.conf make_f2fs sload_f2fs | 42 | LOCAL_REQUIRED_MODULES := mke2fs make_f2fs |
| 43 | 43 | ||
| 44 | LOCAL_SRC_FILES_linux := usb_linux.cpp | 44 | LOCAL_SRC_FILES_linux := usb_linux.cpp |
| 45 | LOCAL_STATIC_LIBRARIES_linux := libselinux | 45 | LOCAL_STATIC_LIBRARIES_linux := libselinux |
| 46 | LOCAL_REQUIRED_MODULES_linux := e2fsdroid mke2fs.conf sload_f2fs | ||
| 46 | 47 | ||
| 47 | LOCAL_SRC_FILES_darwin := usb_osx.cpp | 48 | LOCAL_SRC_FILES_darwin := usb_osx.cpp |
| 48 | LOCAL_STATIC_LIBRARIES_darwin := libselinux | 49 | LOCAL_STATIC_LIBRARIES_darwin := libselinux |
| 50 | LOCAL_REQUIRED_MODULES_darwin := e2fsdroid mke2fs.conf sload_f2fs | ||
| 49 | LOCAL_LDLIBS_darwin := -lpthread -framework CoreFoundation -framework IOKit -framework Carbon | 51 | LOCAL_LDLIBS_darwin := -lpthread -framework CoreFoundation -framework IOKit -framework Carbon |
| 50 | LOCAL_CFLAGS_darwin := -Wno-unused-parameter | 52 | LOCAL_CFLAGS_darwin := -Wno-unused-parameter |
| 51 | 53 | ||