diff options
author | Brian Carlstrom <bdc@google.com> | 2014-06-13 22:26:55 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-06-13 22:26:55 +0000 |
commit | d0388a36b67665be55162388337055ee21a43206 (patch) | |
tree | 83cde2a3c1a04aad1a751312ce60883b77c79f1c | |
parent | ecca567340aae01466e3a84f42ec11744bb26775 (diff) | |
parent | bf0b5c8b5cbd6785bced36c99bc92ab3d9b143b1 (diff) | |
download | stlport-lollipop-mr1-fi-release.tar.gz |
am bf0b5c8b: am dc05ca5b: Merge changes I12644a0e,Idbe25881android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-release
* commit 'bf0b5c8b5cbd6785bced36c99bc92ab3d9b143b1':
Remove obsolete sincos from stlport
Fix sincosf -> sincosf recursion
-rwxr-xr-x | Android.mk | 5 | ||||
-rw-r--r-- | src/sincos.c | 56 |
2 files changed, 0 insertions, 61 deletions
@@ -47,11 +47,6 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(libstlport_src_files) -# This is needed to work around the problem that libm.so in NDK does not -# have the sincos*() functions. - -LOCAL_SRC_FILES += src/sincos.c - LOCAL_MODULE := libstlport LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk diff --git a/src/sincos.c b/src/sincos.c deleted file mode 100644 index 520aa7b..0000000 --- a/src/sincos.c +++ /dev/null @@ -1,56 +0,0 @@ -/*- - * Copyright (c) 2010 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: - * 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 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 AUTHOR 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. - * - */ -#define _GNU_SOURCE 1 -#include <math.h> - -/* - * This file is almost the same as bionic/libm/sincos.c except - * we declare the function to have hiddlen visibility. The library - * libstlport.so is linked against libm.so in the NDK, which does not - * have sincos(), sincosf() and sincosl(). These functions are used - * in code generated by gcc-4.6.0 so we need to provide them. We don't - * want to export these functions here, hence we declare them hidden. - */ -#define HIDDEN __attribute__ ((visibility ("hidden"))) - -void HIDDEN sincos(double x, double *psin, double *pcos) -{ - *psin = sin(x); - *pcos = cos(x); -} - -void HIDDEN sincosf(float x, float *psin, float *pcos) -{ - *psin = sinf(x); - *pcos = cosf(x); -} - -void HIDDEN sincosl(long double x, long double *psin, long double *pcos) -{ - *psin = sin(x); - *pcos = cos(x); -} |