diff options
| author | Elliott Hughes <enh@google.com> | 2015-08-10 13:04:27 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-08-10 13:04:27 -0700 |
| commit | a8b5f7e73703c3d57086f7aded1749a0801dd997 (patch) | |
| tree | 957c5391ec43f5f7b1129fcf15025c5dc5cd7d6b /verity | |
| parent | 1d4a76c50f3f7d7cbc576e993239eb33f8456ff0 (diff) | |
| parent | b699685ebd33f48c11c5cedcc2743efc374a682c (diff) | |
| download | extras-a8b5f7e73703c3d57086f7aded1749a0801dd997.tar.gz | |
resolved conflicts for merge of b699685e to mnc-dev-plus-aosp
Change-Id: I1a298440130d6310523babdbbbf67c0fc1d8d48a
Diffstat (limited to 'verity')
| -rw-r--r-- | verity/Android.mk | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/verity/Android.mk b/verity/Android.mk index 586ca580..1d0574f3 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_MODULE_TAGS := optional 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_STATIC_LIBRARIES := libsparse_host libz LOCAL_SHARED_LIBRARIES := libcrypto-host libbase LOCAL_CFLAGS += -Wall -Werror include $(BUILD_HOST_EXECUTABLE) + +endif # HOST_OS == linux |