diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2015-08-18 16:56:12 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2015-08-28 14:59:08 -0700 |
| commit | d48a1c1ec64a0071b1f81cf9fa5d8b6d92a3b900 (patch) | |
| tree | ebf0a4c521f078e0c20ae5787d8e739a876f0c4e /ext4_utils | |
| parent | 2c0f9f263cd6c3857850c7d3a8f2aabb63ce48be (diff) | |
| download | extras-d48a1c1ec64a0071b1f81cf9fa5d8b6d92a3b900.tar.gz | |
Remove HOST_OS checks, whitelist windows module
This doesn't remove the HOST_OS checks later in the file, those can be
removed once LOCAL_MODULE_HOST_OS is enforced.
Bug: 23566667
Change-Id: I0032022b470bcc8d5546ed6f8dbd99e3d0cf3db5
Diffstat (limited to 'ext4_utils')
| -rw-r--r-- | ext4_utils/Android.mk | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/ext4_utils/Android.mk b/ext4_utils/Android.mk index 8953b459..c01f46ab 100644 --- a/ext4_utils/Android.mk +++ b/ext4_utils/Android.mk @@ -27,9 +27,9 @@ LOCAL_CFLAGS += -fno-strict-aliasing LOCAL_STATIC_LIBRARIES := \ libsparse_host \ libz -ifneq ($(HOST_OS),windows) - LOCAL_STATIC_LIBRARIES += libselinux -endif +LOCAL_STATIC_LIBRARIES_darwin += libselinux +LOCAL_STATIC_LIBRARIES_linux += libselinux +LOCAL_MODULE_HOST_OS := darwin linux windows include $(BUILD_HOST_STATIC_LIBRARY) @@ -41,12 +41,11 @@ LOCAL_STATIC_LIBRARIES += \ libext4_utils_host \ libsparse_host \ libz -ifeq ($(HOST_OS),windows) - LOCAL_LDLIBS += -lws2_32 -else - LOCAL_SHARED_LIBRARIES += libselinux - LOCAL_CFLAGS := -DHOST -endif +LOCAL_LDLIBS_windows += -lws2_32 +LOCAL_SHARED_LIBRARIES_darwin += libselinux +LOCAL_SHARED_LIBRARIES_linux += libselinux +LOCAL_CFLAGS_darwin := -DHOST +LOCAL_CFLAGS_linux := -DHOST include $(BUILD_HOST_EXECUTABLE) |