diff options
| author | Elliott Hughes <enh@google.com> | 2015-08-10 23:04:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-10 23:04:53 +0000 |
| commit | ea239735a66f87407e95f42fa9d78315596ca28d (patch) | |
| tree | aa6e5ccb3cdc9309e22bb27f0560b3825c6e8530 /verity | |
| parent | 3881aa9e018e3b1796dfb890643ccb565056c850 (diff) | |
| parent | 31d0d7cbc1f4ed6a9295dd326104b8071478f924 (diff) | |
| download | extras-ea239735a66f87407e95f42fa9d78315596ca28d.tar.gz | |
am 31d0d7cb: Merge "Add <endian.h> back and stop building one tool for the Mac."
* commit '31d0d7cbc1f4ed6a9295dd326104b8071478f924':
Add <endian.h> back and stop building one tool for the Mac.
Diffstat (limited to 'verity')
| -rw-r--r-- | verity/Android.mk | 4 | ||||
| -rw-r--r-- | verity/verify_boot_signature.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/verity/Android.mk b/verity/Android.mk index bbe74bb1..5db543bd 100644 --- a/verity/Android.mk +++ b/verity/Android.mk @@ -1,5 +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,6 +11,8 @@ LOCAL_SHARED_LIBRARIES := libcrypto-host LOCAL_C_INCLUDES += external/openssl/include system/extras/ext4_utils system/core/mkbootimg include $(BUILD_HOST_EXECUTABLE) +endif # HOST_OS == linux + include $(CLEAR_VARS) LOCAL_MODULE := generate_verity_key LOCAL_SRC_FILES := generate_verity_key.c diff --git a/verity/verify_boot_signature.c b/verity/verify_boot_signature.c index 62c87da3..58b7a194 100644 --- a/verity/verify_boot_signature.c +++ b/verity/verify_boot_signature.c @@ -16,6 +16,7 @@ #define _LARGEFILE64_SOURCE +#include <endian.h> #include <stddef.h> #include <stdint.h> #include <stdlib.h> |