From 3d125175d75334999ab33f6409eb969a63e42522 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 2 May 2016 14:55:28 -0700 Subject: [PATCH] Move somewhere more private. Bug: http://b/28519060 Change-Id: I1c7811f95f46c65d4152bcf509b6e048c45bc28b --- libc/include/machine/endian.h | 35 ---------------------- .../android/include/machine/endian.h | 1 + libm/Android.mk | 5 +++- .../android/include/machine/endian.h | 1 + 4 files changed, 6 insertions(+), 36 deletions(-) delete mode 100644 libc/include/machine/endian.h create mode 100644 libc/upstream-freebsd/android/include/machine/endian.h create mode 100644 libm/upstream-freebsd/android/include/machine/endian.h diff --git a/libc/include/machine/endian.h b/libc/include/machine/endian.h deleted file mode 100644 index ac8951920..000000000 --- a/libc/include/machine/endian.h +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2014 The Android Open Source Project - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#ifndef _MACHINE_ENDIAN_H_ -#define _MACHINE_ENDIAN_H_ - -/* This file is for BSD source compatibility only. Use or instead. */ -#include - -#endif /* _MACHINE_ENDIAN_H_ */ diff --git a/libc/upstream-freebsd/android/include/machine/endian.h b/libc/upstream-freebsd/android/include/machine/endian.h new file mode 100644 index 000000000..2dc4d8308 --- /dev/null +++ b/libc/upstream-freebsd/android/include/machine/endian.h @@ -0,0 +1 @@ +#include diff --git a/libm/Android.mk b/libm/Android.mk index 7200e5ff4..b07e426d9 100644 --- a/libm/Android.mk +++ b/libm/Android.mk @@ -507,7 +507,10 @@ endif LOCAL_C_INCLUDES_x86 += $(LOCAL_PATH)/i387 -LOCAL_C_INCLUDES += $(LOCAL_PATH)/upstream-freebsd/lib/msun/src/ +LOCAL_C_INCLUDES += \ + $(LOCAL_PATH)/upstream-freebsd/android/include/ \ + $(LOCAL_PATH)/upstream-freebsd/lib/msun/src/ \ + LOCAL_C_INCLUDES_64 += $(LOCAL_PATH)/upstream-freebsd/lib/msun/ld128/ LOCAL_ARM_MODE := arm diff --git a/libm/upstream-freebsd/android/include/machine/endian.h b/libm/upstream-freebsd/android/include/machine/endian.h new file mode 100644 index 000000000..2dc4d8308 --- /dev/null +++ b/libm/upstream-freebsd/android/include/machine/endian.h @@ -0,0 +1 @@ +#include -- 2.11.0