I'm not sure why git thought there was a conflict; it thought these
files had been deleted in master and renamed in lmp-preview-dev. In
reality, they've never existed anywhere, and were created in
lmp-preview-dev by the change being merged. Weird.
Conflicts:
ndk/platforms/android-21/arch-arm/symbols/libGLESv3.so.functions.txt
ndk/platforms/android-21/arch-arm/symbols/libGLESv3.so.variables.txt
ndk/platforms/android-21/arch-arm64/symbols/libGLESv3.so.functions.txt
ndk/platforms/android-21/arch-arm64/symbols/libGLESv3.so.variables.txt
ndk/platforms/android-21/arch-mips/symbols/libGLESv3.so.functions.txt
ndk/platforms/android-21/arch-mips/symbols/libGLESv3.so.variables.txt
ndk/platforms/android-21/arch-mips64/symbols/libGLESv3.so.variables.txt
ndk/platforms/android-21/arch-x86/symbols/libGLESv3.so.variables.txt
ndk/platforms/android-21/arch-x86_64/symbols/libGLESv3.so.variables.txt
Change-Id: Ic7cc66f1fa053ff05d55911caad92dfd6669138d
Such that the following can correctly populate sysroot just enough to rebuild
mips64el toolchain
./build/tools/gen-platforms.sh --minimal --dst-dir=$NDK --ndk-dir=$NDK --arch=mips64
Change-Id: Ib37516bfe4c4b6a0c5b479d7cec8764c161f02c8
The original arch-arm libGLESv1_CM.so and libGLESv2.so symbols in
android-4 and android-5 were correct. They didn't include some vendor
extension symbols that are in the platform library but that apps
should query at runtime rather than link against.
When arch-x86 and arch-mips were added in android-9, they mistakenly
included these extension symbols. Oh well, for compatibility we can't
fix that now.
The android-20 symbols for all architectures were copied from x86 or
mips, and include the extension symbols. To avoid spreading the
mistake, this change:
(a) Removes the symbol files for architectures that existed in earlier
versions of the platform, since they shouldn't change in android-20.
(b) Removes the extension symbols on 64-bit platforms, so they match
the symbols in arch-arm.
(cherry picked from commit 74439535fa71e38a19734406b69af63773997edc)
Change-Id: Id675df1a1e2c43d74fee672be33357ffd1723fd0
The original arch-arm libGLESv1_CM.so and libGLESv2.so symbols in
android-4 and android-5 were correct. They didn't include some vendor
extension symbols that are in the platform library but that apps
should query at runtime rather than link against.
When arch-x86 and arch-mips were added in android-9, they mistakenly
included these extension symbols. Oh well, for compatibility we can't
fix that now.
The android-20 symbols for all architectures were copied from x86 or
mips, and include the extension symbols. To avoid spreading the
mistake, this change:
(a) Removes the symbol files for architectures that existed in earlier
versions of the platform, since they shouldn't change in android-20.
(b) Removes the extension symbols on 64-bit platforms, so they match
the symbols in arch-arm.
Change-Id: Ib227d9d163bfe2859b13eb57dc19518d3a3f90d0
When multilib toolchain in NDK is used in -m32 mode we need 32-bit static libs
available for static compilation.
Change-Id: Ie7b5659f05338565fd19550ae4368934422e8b86
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
The patch at [1] was reverted because ndk/sources/android/cpu-features
is now part of the platform build (as a dependency of libportable), and
now requires dlopen()/dlsym()/dlclose().
Because the platform build system doesn't support LOCAL_EXPORT_LDLIBS,
add the dependency to libportable's own module definition instead.
After this patch is submitted, it's possible to re-apply the original
patch and get a working build.
[1] https://android-review.googlesource.com/#/c/91380/
BUG=13679666
Change-Id: I54b4376a562242d21631eaf13090650decfe791d
Fixes two issues:
1. Remove redundant check for hard-float in Teapot/MoreTeapots and ndk_helper
they depend. The ndk-build system add those flags already for armeabi-v7a-hard
2. native-audio in debug build: assert on the non-existance var
Change-Id: Id6b2d38a264c2f2d0e0c7fe625991fcee1762800
$NDK/tests/standalone/run.sh fail to run with last update on stdint.h
to android-20 level. Restore stdint.h for fear of the new one breaking
the existing apps
Also fix signal_portable.h to use SIGRTMIN/MAX in old headers
(which got renamed to __SIGRTMIN in new header)
Also change _JBLEN to 1024 which shall be large enough to store CPU
states for forseable future.
Change-Id: Ia9c03558a258c10434eb8e6985adc122532feaa3
Update signal.c for build with old platforms
Change-Id: Ica87465a73004c0885d51e384acd4f42947cc19b
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
It appears that upstream 3.5 still can't accept __builtin_isnan redeclared
with calling convention, eg.
cat > isnan.c <<EOF
int __builtin_isnan(double) __attribute__((pcs("aapcs")));
EOF
clang -target armv5te-none-linux-androideabi -c isnan.c
isnan.c:1:5: error: function declared 'aapcs' here was previously declared without calling convention
int __builtin_isnan(double) __attribute__((pcs("aapcs")));
^
isnan.c:1:5: note: previous declaration is here
Change-Id: Iff466fd913c3deec27aa3ff355a208543028d368
