From 9ff50d7a5f469b7c69f2a95d54ca031ef67e8a81 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 31 Jan 2017 15:49:20 -0800 Subject: [PATCH] Remove NDK crtbrand.c. Bug: http://b/34779141 Test: builds Change-Id: Ia38c3c24ddae8eff173cfee20aff49f061b8751f --- ndk/platforms/common/src/crtbrand.c | 60 ----------------------------- 1 file changed, 60 deletions(-) delete mode 100644 ndk/platforms/common/src/crtbrand.c diff --git a/ndk/platforms/common/src/crtbrand.c b/ndk/platforms/common/src/crtbrand.c deleted file mode 100644 index 2065e3c83..000000000 --- a/ndk/platforms/common/src/crtbrand.c +++ /dev/null @@ -1,60 +0,0 @@ -/*- - * Copyright 2000 David E. O'Brien, John D. Polstra. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. 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 AUTHOR ``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 AUTHOR 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. - */ - -// TODO: this file should just be a .S file like bionic's crtbrand. - -/* The following trick defines int32_t w/o including - We want "int" to be 4-byte. But just in case it isn't, the following - line turns into "typedef int int32_t[0]" and later fails with error messages - read like: - - crtbrand.c:83: error: excess elements in struct initializer - */ -typedef int int32_t[sizeof(int) == 4]; - -#define ABI_VENDOR "Android" -#define ABI_SECTION ".note.android.ident" -#define ABI_NOTETYPE 1 -#define ABI_ANDROID_API PLATFORM_SDK_VERSION - -#define NDK_RESERVED_SIZE 64 - -static const struct { - int32_t namesz; - int32_t descsz; - int32_t type; - char name[sizeof(ABI_VENDOR)]; - int32_t android_api; - char ndk_version[NDK_RESERVED_SIZE]; - char ndk_build_number[NDK_RESERVED_SIZE]; -} abitag __attribute__ ((section (ABI_SECTION), aligned(4), used)) = { - sizeof(ABI_VENDOR), - sizeof(int32_t) + NDK_RESERVED_SIZE + NDK_RESERVED_SIZE, - ABI_NOTETYPE, - ABI_VENDOR, - ABI_ANDROID_API, - ABI_NDK_VERSION, - ABI_NDK_BUILD_NUMBER, -};