commit 31d0d7cbc1f4ed6a9295dd326104b8071478f924
author Elliott Hughes <enh@google.com> Mon Aug 10 22:53:27 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Aug 10 22:53:27 2015 +0000
tree b985a6fb7b73be64578dcfe3fa5f6223c1146ff5
parent 4361173d8b9d348e9566f754044db3fedfdf47eb
parent fa5185ea275da334fccafafb5ce21dedfc02e9a2

Merge "Add <endian.h> back and stop building one tool for the Mac."

verity/Android.mk

diff --git a/verity/Android.mk b/verity/Android.mk
index bbe74bb..5db543b 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_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

verity/verify_boot_signature.c

diff --git a/verity/verify_boot_signature.c b/verity/verify_boot_signature.c
index 62c87da..58b7a19 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>