commit 21e6bf3b386cdf450671bc6ab96ef4834949579d
author Mohamad Ayyash <mkayyash@google.com> Mon Apr 04 19:46:47 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 04 19:46:48 2016 +0000
tree 6e75fdda50352071e2d3c24ee6809f02110554d7
parent 1287843ab714447d0fb1f6a42ce416f6cfe9db38
parent 5d65020e44d0abb629d8d05c6db1386a2c373b4b

Merge "Always build squashfs host tools" into nyc-dev

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index b7e518f..c892995 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -532,13 +532,8 @@
 MAKE_EXT4FS := $(HOST_OUT_EXECUTABLES)/make_ext4fs$(HOST_EXECUTABLE_SUFFIX)
 BLK_ALLOC_TO_BASE_FS := $(HOST_OUT_EXECUTABLES)/blk_alloc_to_base_fs$(HOST_EXECUTABLE_SUFFIX)
 MKEXTUSERIMG := $(HOST_OUT_EXECUTABLES)/mkuserimg.sh
-ifeq ($(HOST_OS),linux)
 MAKE_SQUASHFS := $(HOST_OUT_EXECUTABLES)/mksquashfs$(HOST_EXECUTABLE_SUFFIX)
 MKSQUASHFSUSERIMG := $(HOST_OUT_EXECUTABLES)/mksquashfsimage.sh
-else
-MAKE_SQUASHFS :=
-MKSQUASHFSUSERIMG :=
-endif
 MAKE_F2FS := $(HOST_OUT_EXECUTABLES)/make_f2fs$(HOST_EXECUTABLE_SUFFIX)
 MKF2FSUSERIMG := $(HOST_OUT_EXECUTABLES)/mkf2fsuserimg.sh
 SIMG2IMG := $(HOST_OUT_EXECUTABLES)/simg2img$(HOST_EXECUTABLE_SUFFIX)