diff options
| author | Sami Tolvanen <samitolvanen@google.com> | 2015-09-29 13:12:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-29 13:12:20 +0000 |
| commit | 66059d6acd45ad1e674db44f5bd90fc36d5f87e9 (patch) | |
| tree | b82661a396161b0323c75782c25a395fca6dcaaf /verity | |
| parent | 180e08a70c546a2e72914ec329f7e989975e5811 (diff) | |
| parent | 482fe9e37737e5d6c7d0a4e0fe303e7d097971aa (diff) | |
| download | extras-66059d6acd45ad1e674db44f5bd90fc36d5f87e9.tar.gz | |
am 482fe9e3: Merge "fec: enable building on Mac"
* commit '482fe9e37737e5d6c7d0a4e0fe303e7d097971aa':
fec: enable building on Mac
Diffstat (limited to 'verity')
| -rw-r--r-- | verity/fec/Android.mk | 6 | ||||
| -rw-r--r-- | verity/fec/image.cpp | 9 | ||||
| -rw-r--r-- | verity/fec/image.h | 1 |
3 files changed, 11 insertions, 5 deletions
diff --git a/verity/fec/Android.mk b/verity/fec/Android.mk index 774878d4..c13f5775 100644 --- a/verity/fec/Android.mk +++ b/verity/fec/Android.mk @@ -1,10 +1,10 @@ LOCAL_PATH:= $(call my-dir) -ifeq ($(HOST_OS),linux) - include $(CLEAR_VARS) LOCAL_CLANG := true +ifeq ($(HOST_OS),linux) LOCAL_SANITIZE := integer +endif LOCAL_MODULE := fec LOCAL_SRC_FILES := main.cpp image.cpp LOCAL_MODULE_TAGS := optional @@ -21,8 +21,6 @@ LOCAL_CFLAGS += -Wall -Werror -O3 LOCAL_C_INCLUDES += external/fec include $(BUILD_HOST_EXECUTABLE) -endif # HOST_OS == linux - include $(CLEAR_VARS) LOCAL_CLANG := true LOCAL_SANITIZE := integer diff --git a/verity/fec/image.cpp b/verity/fec/image.cpp index 7acf4c87..41018158 100644 --- a/verity/fec/image.cpp +++ b/verity/fec/image.cpp @@ -26,7 +26,6 @@ extern "C" { #include <errno.h> #include <fcntl.h> #include <getopt.h> -#include <linux/fs.h> #include <openssl/sha.h> #include <pthread.h> #include <stdbool.h> @@ -39,6 +38,14 @@ extern "C" { #endif #include "image.h" +#if defined(__linux__) + #include <linux/fs.h> +#elif defined(__APPLE__) + #include <sys/disk.h> + #define BLKGETSIZE64 DKIOCGETBLOCKCOUNT + #define O_LARGEFILE 0 +#endif + void image_init(image *ctx) { memset(ctx, 0, sizeof(*ctx)); diff --git a/verity/fec/image.h b/verity/fec/image.h index a7f55530..f235eb58 100644 --- a/verity/fec/image.h +++ b/verity/fec/image.h @@ -17,6 +17,7 @@ #ifndef __FEC_H__ #define __FEC_H__ +#include <utils/Compat.h> #include <fec/io.h> #include <fec/ecc.h> |