diff --git a/mcld-device-build.mk b/mcld-device-build.mk
index 9f445b3..851c261 100644
--- a/mcld-device-build.mk
+++ b/mcld-device-build.mk
@@ -3,35 +3,36 @@
 # The three inline options together reduce libbcc.so almost 1MB.
 # We move them from global build/core/combo/TARGET_linux-arm.mk
 # to here.
-LOCAL_CFLAGS := -DANDROID_TARGET_BUILD \
-		-finline-limit=64 \
-		-finline-functions \
-		-fno-inline-functions-called-once \
-		$(LOCAL_CFLAGS)
+LOCAL_CFLAGS := \
+  -DANDROID_TARGET_BUILD \
+  -finline-limit=64 \
+  -finline-functions \
+  -fno-inline-functions-called-once \
+  $(LOCAL_CFLAGS)
 
-LOCAL_CPPFLAGS :=	\
-	$(LOCAL_CPPFLAGS)	\
-  -Wformat  \
+LOCAL_CPPFLAGS := \
+  $(LOCAL_CPPFLAGS) \
+  -Wformat \
   -Werror=format-security \
   -Werror=return-type \
-  -Werror=non-virtual-dtor  \
+  -Werror=non-virtual-dtor \
   -Werror=address \
-  -Werror=sequence-point  \
-	-Woverloaded-virtual	\
-	-Wno-sign-promo
+  -Werror=sequence-point \
+  -Woverloaded-virtual \
+  -Wno-sign-promo
 
 ifeq ($(MCLD_ENABLE_ASSERTION),true)
   LOCAL_CPPFLAGS += \
-    -D_DEBUG  \
+    -D_DEBUG \
     -UNDEBUG
 endif
 
 # Make sure bionic is first so we can include system headers.
-LOCAL_C_INCLUDES :=	\
-	bionic \
-	external/stlport/stlport \
+LOCAL_C_INCLUDES := \
+  bionic \
+  external/stlport/stlport \
   $(MCLD_ROOT_PATH)/include \
-	$(LLVM_ROOT_PATH)	\
-	$(LLVM_ROOT_PATH)/include	\
-	$(LLVM_ROOT_PATH)/device/include	\
-	$(LOCAL_C_INCLUDES)
+  $(LLVM_ROOT_PATH) \
+  $(LLVM_ROOT_PATH)/include \
+  $(LLVM_ROOT_PATH)/device/include \
+  $(LOCAL_C_INCLUDES)
diff --git a/mcld-host-build.mk b/mcld-host-build.mk
index 2bedf07..c6bd67b 100644
--- a/mcld-host-build.mk
+++ b/mcld-host-build.mk
@@ -1,27 +1,27 @@
 include $(LLVM_HOST_BUILD_MK)
 
-LOCAL_CPPFLAGS :=	\
-	$(LOCAL_CPPFLAGS)	\
-  -Wformat  \
+LOCAL_CPPFLAGS := \
+  $(LOCAL_CPPFLAGS) \
+  -Wformat \
   -Werror=format-security \
   -Werror=return-type \
-  -Werror=non-virtual-dtor  \
+  -Werror=non-virtual-dtor \
   -Werror=address \
-  -Werror=sequence-point  \
-	-Woverloaded-virtual	\
-	-Wno-sign-promo
+  -Werror=sequence-point \
+  -Woverloaded-virtual \
+  -Wno-sign-promo
 
 ifeq ($(MCLD_ENABLE_ASSERTION),true)
   LOCAL_CPPFLAGS += \
-    -D_DEBUG  \
+    -D_DEBUG \
     -UNDEBUG
 endif
 
-LOCAL_C_INCLUDES :=	\
+LOCAL_C_INCLUDES := \
   $(MCLD_ROOT_PATH)/include \
-	$(LLVM_ROOT_PATH)	\
-	$(LLVM_ROOT_PATH)/include	\
-	$(LLVM_ROOT_PATH)/host/include	\
-	$(LOCAL_C_INCLUDES)
+  $(LLVM_ROOT_PATH) \
+  $(LLVM_ROOT_PATH)/include \
+  $(LLVM_ROOT_PATH)/host/include \
+  $(LOCAL_C_INCLUDES)
 
 LOCAL_IS_HOST_MODULE := true