summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-08-10 15:49:04 -0700
committerElliott Hughes <enh@google.com>2015-08-10 15:49:04 -0700
commitfa5185ea275da334fccafafb5ce21dedfc02e9a2 (patch)
treeb985a6fb7b73be64578dcfe3fa5f6223c1146ff5
parent4361173d8b9d348e9566f754044db3fedfdf47eb (diff)
downloadextras-fa5185ea275da334fccafafb5ce21dedfc02e9a2.tar.gz
Add <endian.h> back and stop building one tool for the Mac.
We can't stop building all this stuff until we clean up the build system to not require the OTA tools on Mac OS. This code does actually use htobe64 and so should have included <endian.h>, so put that back. Change-Id: I2807b4f237d3e26d470652f373f2de85864691c4
-rw-r--r--verity/Android.mk4
-rw-r--r--verity/verify_boot_signature.c1
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>