Workaround for linker warning in latest Android NDK
authorSam Lantinga <slouken@libsdl.org>
Thu, 02 Nov 2017 10:14:22 -0700
changeset 842e94aeeed56d2
parent 841 131286a6b7b8
child 843 d98f1d930524
Workaround for linker warning in latest Android NDK
external/mpg123-1.25.6.patch
external/mpg123-1.25.6/Android.mk
     1.1 --- a/external/mpg123-1.25.6.patch	Fri Oct 27 08:46:25 2017 -0700
     1.2 +++ b/external/mpg123-1.25.6.patch	Thu Nov 02 10:14:22 2017 -0700
     1.3 @@ -1,6 +1,6 @@
     1.4  diff -ruN mpg123-1.25.6.orig/android/config.h mpg123-1.25.6/android/config.h
     1.5  --- mpg123-1.25.6.orig/android/config.h	1969-12-31 16:00:00.000000000 -0800
     1.6 -+++ mpg123-1.25.6/android/config.h	2017-10-18 00:55:57.906177396 -0700
     1.7 ++++ mpg123-1.25.6/android/config.h	2017-10-23 07:43:01.919907577 -0700
     1.8  @@ -0,0 +1,478 @@
     1.9  +/* src/config.h.  Generated from config.h.in by configure.  */
    1.10  +/* src/config.h.in.  Generated from configure.ac by autoheader.  */
    1.11 @@ -482,7 +482,7 @@
    1.12  +/* #undef uintptr_t */
    1.13  diff -ruN mpg123-1.25.6.orig/android/mpg123.h mpg123-1.25.6/android/mpg123.h
    1.14  --- mpg123-1.25.6.orig/android/mpg123.h	1969-12-31 16:00:00.000000000 -0800
    1.15 -+++ mpg123-1.25.6/android/mpg123.h	2017-10-18 00:57:07.438009786 -0700
    1.16 ++++ mpg123-1.25.6/android/mpg123.h	2017-10-23 07:43:01.919907577 -0700
    1.17  @@ -0,0 +1,1441 @@
    1.18  +/*
    1.19  +	libmpg123: MPEG Audio Decoder library (version 1.25.6)
    1.20 @@ -1927,8 +1927,8 @@
    1.21  +#endif
    1.22  diff -ruN mpg123-1.25.6.orig/Android.mk mpg123-1.25.6/Android.mk
    1.23  --- mpg123-1.25.6.orig/Android.mk	1969-12-31 16:00:00.000000000 -0800
    1.24 -+++ mpg123-1.25.6/Android.mk	2017-10-18 01:34:30.879829213 -0700
    1.25 -@@ -0,0 +1,110 @@
    1.26 ++++ mpg123-1.25.6/Android.mk	2017-11-02 10:11:23.366221713 -0700
    1.27 +@@ -0,0 +1,115 @@
    1.28  +LOCAL_PATH := $(call my-dir)
    1.29  +
    1.30  +include $(CLEAR_VARS)
    1.31 @@ -1944,65 +1944,65 @@
    1.32  +
    1.33  +DECODER_SRC_NEON := \
    1.34  +    src/libmpg123/stringbuf.c \
    1.35 -+	src/libmpg123/icy.c \
    1.36 -+	src/libmpg123/icy2utf8.c \
    1.37 -+	src/libmpg123/ntom.c \
    1.38 -+	src/libmpg123/synth.c \
    1.39 -+	src/libmpg123/synth_8bit.c \
    1.40 -+	src/libmpg123/layer1.c \
    1.41 -+	src/libmpg123/layer2.c \
    1.42 -+	src/libmpg123/layer3.c \
    1.43 -+	src/libmpg123/dct36_neon.S \
    1.44 -+	src/libmpg123/dct64_neon_float.S \
    1.45 -+	src/libmpg123/synth_neon_float.S \
    1.46 -+	src/libmpg123/synth_neon_s32.S \
    1.47 -+	src/libmpg123/synth_stereo_neon_float.S \
    1.48 -+	src/libmpg123/synth_stereo_neon_s32.S \
    1.49 -+	src/libmpg123/dct64_neon.S \
    1.50 -+	src/libmpg123/synth_neon.S \
    1.51 -+	src/libmpg123/synth_stereo_neon.S \
    1.52 -+	src/libmpg123/synth_s32.c \
    1.53 -+	src/libmpg123/synth_real.c \
    1.54 -+	src/libmpg123/feature.c \
    1.55 ++    src/libmpg123/icy.c \
    1.56 ++    src/libmpg123/icy2utf8.c \
    1.57 ++    src/libmpg123/ntom.c \
    1.58 ++    src/libmpg123/synth.c \
    1.59 ++    src/libmpg123/synth_8bit.c \
    1.60 ++    src/libmpg123/layer1.c \
    1.61 ++    src/libmpg123/layer2.c \
    1.62 ++    src/libmpg123/layer3.c \
    1.63 ++    src/libmpg123/dct36_neon.S \
    1.64 ++    src/libmpg123/dct64_neon_float.S \
    1.65 ++    src/libmpg123/synth_neon_float.S \
    1.66 ++    src/libmpg123/synth_neon_s32.S \
    1.67 ++    src/libmpg123/synth_stereo_neon_float.S \
    1.68 ++    src/libmpg123/synth_stereo_neon_s32.S \
    1.69 ++    src/libmpg123/dct64_neon.S \
    1.70 ++    src/libmpg123/synth_neon.S \
    1.71 ++    src/libmpg123/synth_stereo_neon.S \
    1.72 ++    src/libmpg123/synth_s32.c \
    1.73 ++    src/libmpg123/synth_real.c \
    1.74 ++    src/libmpg123/feature.c \
    1.75  +
    1.76  +DECODER_CFLAGS_X86 := -DOPT_MULTI -DOPT_GENERIC -DOPT_GENERIC_DITHER -DOPT_I386 -DOPT_I586 -DOPT_I586_DITHER -DOPT_MMX -DOPT_3DNOW -DOPT_3DNOW_VINTAGE -DOPT_3DNOWEXT -DOPT_3DNOWEXT_VINTAGE -DOPT_SSE -DOPT_SSE_VINTAGE -DREAL_IS_FLOAT
    1.77  +
    1.78  +DECODER_SRC_X86 := \
    1.79  +    src/libmpg123/stringbuf.c \
    1.80 -+	src/libmpg123/icy.c \
    1.81 -+	src/libmpg123/icy2utf8.c \
    1.82 -+	src/libmpg123/ntom.c \
    1.83 -+	src/libmpg123/synth.c \
    1.84 -+	src/libmpg123/synth_8bit.c \
    1.85 -+	src/libmpg123/layer1.c \
    1.86 -+	src/libmpg123/layer2.c \
    1.87 -+	src/libmpg123/layer3.c \
    1.88 -+	src/libmpg123/synth_s32.c \
    1.89 -+	src/libmpg123/synth_real.c \
    1.90 -+	src/libmpg123/dct64_i386.c \
    1.91 -+	src/libmpg123/synth_i586.S \
    1.92 -+	src/libmpg123/synth_i586_dither.S \
    1.93 -+	src/libmpg123/dct64_mmx.S \
    1.94 -+	src/libmpg123/tabinit_mmx.S \
    1.95 -+	src/libmpg123/synth_mmx.S \
    1.96 -+	src/libmpg123/synth_3dnow.S \
    1.97 -+	src/libmpg123/dct64_3dnow.S \
    1.98 -+	src/libmpg123/equalizer_3dnow.S \
    1.99 -+	src/libmpg123/dct36_3dnow.S \
   1.100 -+	src/libmpg123/dct64_3dnowext.S \
   1.101 -+	src/libmpg123/synth_3dnowext.S \
   1.102 -+	src/libmpg123/dct36_3dnowext.S \
   1.103 -+	src/libmpg123/dct64_sse_float.S \
   1.104 -+	src/libmpg123/synth_sse_float.S \
   1.105 -+	src/libmpg123/synth_stereo_sse_float.S \
   1.106 -+	src/libmpg123/synth_sse_s32.S \
   1.107 -+	src/libmpg123/synth_stereo_sse_s32.S \
   1.108 -+	src/libmpg123/dct36_sse.S \
   1.109 -+	src/libmpg123/dct64_sse.S \
   1.110 -+	src/libmpg123/synth_sse.S \
   1.111 -+	src/libmpg123/getcpuflags.S \
   1.112 -+	src/libmpg123/dither.c \
   1.113 -+	src/libmpg123/feature.c \
   1.114 ++    src/libmpg123/icy.c \
   1.115 ++    src/libmpg123/icy2utf8.c \
   1.116 ++    src/libmpg123/ntom.c \
   1.117 ++    src/libmpg123/synth.c \
   1.118 ++    src/libmpg123/synth_8bit.c \
   1.119 ++    src/libmpg123/layer1.c \
   1.120 ++    src/libmpg123/layer2.c \
   1.121 ++    src/libmpg123/layer3.c \
   1.122 ++    src/libmpg123/synth_s32.c \
   1.123 ++    src/libmpg123/synth_real.c \
   1.124 ++    src/libmpg123/dct64_i386.c \
   1.125 ++    src/libmpg123/synth_i586.S \
   1.126 ++    src/libmpg123/synth_i586_dither.S \
   1.127 ++    src/libmpg123/dct64_mmx.S \
   1.128 ++    src/libmpg123/tabinit_mmx.S \
   1.129 ++    src/libmpg123/synth_mmx.S \
   1.130 ++    src/libmpg123/synth_3dnow.S \
   1.131 ++    src/libmpg123/dct64_3dnow.S \
   1.132 ++    src/libmpg123/equalizer_3dnow.S \
   1.133 ++    src/libmpg123/dct36_3dnow.S \
   1.134 ++    src/libmpg123/dct64_3dnowext.S \
   1.135 ++    src/libmpg123/synth_3dnowext.S \
   1.136 ++    src/libmpg123/dct36_3dnowext.S \
   1.137 ++    src/libmpg123/dct64_sse_float.S \
   1.138 ++    src/libmpg123/synth_sse_float.S \
   1.139 ++    src/libmpg123/synth_stereo_sse_float.S \
   1.140 ++    src/libmpg123/synth_sse_s32.S \
   1.141 ++    src/libmpg123/synth_stereo_sse_s32.S \
   1.142 ++    src/libmpg123/dct36_sse.S \
   1.143 ++    src/libmpg123/dct64_sse.S \
   1.144 ++    src/libmpg123/synth_sse.S \
   1.145 ++    src/libmpg123/getcpuflags.S \
   1.146 ++    src/libmpg123/dither.c \
   1.147 ++    src/libmpg123/feature.c \
   1.148  +
   1.149  +ifeq ($(TARGET_ARCH_ABI),armeabi)
   1.150  +DECODER_CFLAGS := $(DECODER_CFLAGS_NEON)
   1.151 @@ -2019,17 +2019,22 @@
   1.152  +
   1.153  +LOCAL_CFLAGS := $(DECODER_CFLAGS)
   1.154  +
   1.155 ++# This disables the following warning:
   1.156 ++#   warning: shared library text segment is not shareable
   1.157 ++# However, the library still has PIC unaware assembly!
   1.158 ++LOCAL_DISABLE_FATAL_LINKER_WARNINGS = true
   1.159 ++
   1.160  +LOCAL_SRC_FILES := \
   1.161  +    src/libmpg123/parse.c \
   1.162 -+	src/libmpg123/frame.c \
   1.163 ++    src/libmpg123/frame.c \
   1.164  +    src/libmpg123/format.c \
   1.165 -+	src/libmpg123/dct64.c \
   1.166 ++    src/libmpg123/dct64.c \
   1.167  +    src/libmpg123/equalizer.c \
   1.168 -+	src/libmpg123/id3.c \
   1.169 ++    src/libmpg123/id3.c \
   1.170  +    src/libmpg123/optimize.c \
   1.171 -+	src/libmpg123/readers.c \
   1.172 ++    src/libmpg123/readers.c \
   1.173  +    src/libmpg123/tabinit.c \
   1.174 -+	src/libmpg123/libmpg123.c \
   1.175 ++    src/libmpg123/libmpg123.c \
   1.176  +    src/libmpg123/index.c \
   1.177  +    src/compat/compat_str.c \
   1.178  +    src/compat/compat.c \
     2.1 --- a/external/mpg123-1.25.6/Android.mk	Fri Oct 27 08:46:25 2017 -0700
     2.2 +++ b/external/mpg123-1.25.6/Android.mk	Thu Nov 02 10:14:22 2017 -0700
     2.3 @@ -88,6 +88,11 @@
     2.4  
     2.5  LOCAL_CFLAGS := $(DECODER_CFLAGS)
     2.6  
     2.7 +# This disables the following warning:
     2.8 +#   warning: shared library text segment is not shareable
     2.9 +# However, the library still has PIC unaware assembly!
    2.10 +LOCAL_DISABLE_FATAL_LINKER_WARNINGS = true
    2.11 +
    2.12  LOCAL_SRC_FILES := \
    2.13      src/libmpg123/parse.c \
    2.14      src/libmpg123/frame.c \