resolved conflicts for merge of b699685e to mnc-dev-plus-aosp
Change-Id: I1a298440130d6310523babdbbbf67c0fc1d8d48a
diff --git a/verity/Android.mk b/verity/Android.mk
index 586ca58..1d0574f 100644
--- a/verity/Android.mk
+++ b/verity/Android.mk
@@ -1,6 +1,7 @@
LOCAL_PATH:= $(call my-dir)
ifeq ($(HOST_OS),linux)
+
include $(CLEAR_VARS)
LOCAL_MODULE := verify_boot_signature
LOCAL_SRC_FILES := verify_boot_signature.c
@@ -9,7 +10,6 @@
LOCAL_SHARED_LIBRARIES := libcrypto-host
LOCAL_C_INCLUDES += external/openssl/include system/extras/ext4_utils system/core/mkbootimg
include $(BUILD_HOST_EXECUTABLE)
-endif
include $(CLEAR_VARS)
LOCAL_MODULE := generate_verity_key
@@ -103,3 +103,5 @@
LOCAL_SHARED_LIBRARIES := libcrypto-host libbase
LOCAL_CFLAGS += -Wall -Werror
include $(BUILD_HOST_EXECUTABLE)
+
+endif # HOST_OS == linux