Commit Graph

654 Commits

Author SHA1 Message Date
Andrew Hsieh
0c490572c8 Remove out-dated android-20 and android-21 now called android-L
Change-Id: I6aae2d2ba9381bc719ad8d9784333409fe379523
2014-09-04 11:28:30 -07:00
Marco Nelissen
486a53c016 Add required permission to sample code
Bug: 15014196
Change-Id: I0edf8320e9eaa02031d564735c17c016d7e14fda
2014-09-02 12:08:48 -07:00
Dmitriy Ivanov
ba1f98e1df am 7a6c4e92: am 95c0db1e: am ce3b58a6: Merge "Update dlext.h header"
* commit '7a6c4e9261584e03ca9eaa5ca8465d6eaf87f7bd':
  Update dlext.h header
2014-07-09 12:16:58 +00:00
Andrew Hsieh
a29134d404 am f22634e3: am 1d3c5d4b: am dd524f0c: Merge "Refresh 64-bit headers/libs (WW28)"
* commit 'f22634e3b22590fde355143ea6c1437c713b7bee':
  Refresh 64-bit headers/libs (WW28)
2014-07-08 03:34:56 +00:00
Andrew Hsieh
693fa5d897 am e19c8d59: am e087f83a: am 26e306d9: Merge "Update mips64 lib-bootstrap"
* commit 'e19c8d59b8bb3f8eb5718184c99ddd5048ee4199':
  Update mips64 lib-bootstrap
2014-07-08 03:05:39 +00:00
Andrew Hsieh
45ac4eec03 am 1c7d5d11: am 344f76dc: am 630a1be4: Merge "Remove symlink lib-boostrap"
* commit '1c7d5d11c73946bd1ff86ad49aa9123a1111610e':
  Remove symlink lib-boostrap
2014-07-08 03:05:38 +00:00
Dmitriy Ivanov
b0c2ff09bb Update dlext.h header
Change-Id: Id375e8101f8b86078cdee024184a4ef9d9064928
2014-07-08 15:14:28 -07:00
Andrew Hsieh
0a33b5dd49 Refresh 64-bit headers/libs (WW28)
Change-Id: Ib798ab4730c3b242bc784548ea2d4ffaea5c90d7
2014-07-08 11:19:20 +08:00
Andrew Hsieh
76c079eea2 Update mips64 lib-bootstrap
Turns out previously built mips64el* are mips64r2, not mips64r6

Change-Id: Ic0f82fafe959716eb3a909e367d599a3d4293047
2014-07-08 10:51:03 +08:00
Andrew Hsieh
ed7eb1300d Remove symlink lib-boostrap
next CL will populate mips64r6 lib and lib-boostrap in real directory
previous symlink to android-9/arch-mips which is mips64r2

Change-Id: I59baeb4e5b6f32e0c52c6a0d1a54985808f0534f
2014-06-24 20:40:05 -07:00
Andrew Hsieh
f49334ad54 am 6fa1424b: am 2c3051d7: am c9e0acf2: Merge changes I653740e3,I554024e5
* commit '6fa1424bd53bd0cb005d158bf0fe65ae4882c8c9':
  Restore arm's machine/endian.h to be useful for ARMv5
  Hard-float support in android-L/include/math.h
2014-06-21 10:36:51 +00:00
Andrew Hsieh
d9a37bc02f am 9a6226dc: am d2988ef5: am e514118e: Merge "Fix samples for 64-bit ABIs"
* commit '9a6226dc6d4d5327767e89d7bcebba9aad253ab7':
  Fix samples for 64-bit ABIs
2014-06-21 10:36:49 +00:00
Andrew Hsieh
081a7eb201 am 4b9e4a32: am ea738930: am 1b587c94: Merge "64-bit in android-L"
* commit '4b9e4a3294cec41364d9b444066b812c82d20d35':
  64-bit in android-L
2014-06-21 10:36:45 +00:00
Andrew Hsieh
9c4920b3a6 am 4e6ebfdd: am eacb09c3: am 5fcf5cfc: Merge "Refresh 64-bit headers/libs (WW25)"
* commit '4e6ebfdd46ba3124e405bcd88b4b47d888887400':
  Refresh 64-bit headers/libs (WW25)
2014-06-21 10:36:41 +00:00
Andrew Hsieh
458300640f Fix samples for 64-bit ABIs
1. Set APP_ABI:=all in almost all samples
2. Enhance hello-jni to report more ABIs
3. Fix warnings

Change-Id: I2851c42b77ef8225e32143d225edcf973633e782
2014-06-20 16:42:08 -07:00
Andrew Hsieh
e75afa6aee 64-bit in android-L
See https://android-review.googlesource.com/#/c/99021/

Change-Id: I10daf2da97aa9d3c99661b5d79080b96a0ae9f22
2014-06-20 16:34:39 -07:00
Andrew Hsieh
1b1f01913c Refresh 64-bit headers/libs (WW25)
To bionic: 06366724d572ef005f5bc0ddd8ad46794cbfad3b

Change-Id: I4c676127d357445fc5d09a2c82c5664238105b90
2014-06-20 15:32:42 -07:00
Andrew Hsieh
0faa47e06d Restore arm's machine/endian.h to be useful for ARMv5
Revert bionic c54ca40aef48009e7b0e5b2b3069aad62ffd3453 because
endian.h is seen by APP_ABI=armeabi as well.  Instruction
"rev" and "rev16" doesn't exist until ARMv6

Change-Id: I653740e3704b9b64e3e2a2e17452675635a14776
2014-06-20 16:45:29 -07:00
Andrew Hsieh
1906050b84 Hard-float support in android-L/include/math.h
Change-Id: I554024e5afb7a8be44fb2884ffe369992bd0a959
2014-06-20 16:44:28 -07:00
Andrew Hsieh
65681c0c81 am dfed70ac: am 2a97fd08: am e577c6b4: Merge "Fix ssize_t, WCHAR_MIN and WCHAR_MAX"
* commit 'dfed70acffff17b7116fa01e08c691dd565c4f72':
  Fix ssize_t, WCHAR_MIN and WCHAR_MAX
2014-06-13 21:50:47 +00:00
Andrew Hsieh
68134c8816 am bd92c406: am 31a7026b: am 724e3468: Merge "Update libm_hard.a"
* commit 'bd92c406a5da769a9b6eb71e6486b472176d2b6c':
  Update libm_hard.a
2014-06-13 20:54:35 +00:00
Glenn Kasten
f59aa1d223 Merge "Update OpenSLES_Android.h for API 20" 2014-06-11 21:23:31 +00:00
Andrew Hsieh
95a6cb0724 am e233c416: am 86509e1d: am 0e85aa03: Merge "Add missing mips64 lib-bootstrap"
* commit 'e233c416944455f9ecf00900fb5f5e1075d407f5':
  Add missing mips64 lib-bootstrap
2014-06-11 18:37:19 +00:00
Elliott Hughes
fe134ceca3 am fc800c1d: am 877b9486: am 815d7a7d: Merge "Fix build by removing libportable from the default build."
* commit 'fc800c1dba34a8da105e18242257af56fa2ac754':
  Fix build by removing libportable from the default build.
2014-06-11 17:44:57 +00:00
Andrew Hsieh
e577c6b4e3 Merge "Fix ssize_t, WCHAR_MIN and WCHAR_MAX" 2014-06-10 21:55:12 +00:00
Jesse Hall
94bb931884 resolved conflicts for merge of 3e06bd39 to master
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
2014-06-10 12:17:15 -07:00
Andrew Hsieh
a5c12d1936 Update libm_hard.a
1) Add ldexp.  ldexp used to co-exist in both libc.so and libm.so until
   the removal from libm.so in ICS.  Unfortunately the sole copy of libm_hard.a
   in NDK was compiled from JB source and miss ldexp.  Code compiled with
   hard-float using ldexp may use libc.so which follows soft-float and misbehave
2) Turns out the following (all in fpclassify.o) also exists in recent libc.so
   too.  Add them in libm_hard.a as well:

    __fpclassifyd
    __fpclassifyf
    __fpclassifyl
    __isfinitef
    __isfinite
    __isfinitel
    __isinff
    __isinf
    __isinfl
    __isnanl
    __isnormalf
    __isnormal
    __isnormall
    isinf
    isnan
    isnanf

Change-Id: Ia157fb2911341988de102e55d0c6f6141a9c3dda
2014-06-10 10:58:37 +08:00
Andrew Hsieh
9983b467e5 Fix ssize_t, WCHAR_MIN and WCHAR_MAX
1) ssize_t is int, instead of long int
2) WCHAR_MIN and WCHAR_MAX be consistent with bionic's:
   respond to __WCHAR_UNSIGNED__, work for both signed (X86/MIPS)
   and unsigned (ARM) wchar_t, and work for -fshort-wchar too

Change-Id: Ief1be007571b50c5d63a819df489f9d3f9b47bc8
2014-06-10 10:51:46 +08:00
Andrew Hsieh
0e85aa033e Merge "Add missing mips64 lib-bootstrap" 2014-06-10 01:08:44 +00:00
Elliott Hughes
cbe970b82a Fix build by removing libportable from the default build.
Easier than working out how to fix the fenv stuf...

Change-Id: Id457d4fcd790b1fc13047cba29c7d47118196a87
2014-06-09 14:51:24 -07:00
Andrew Hsieh
2ae52388f3 Add missing mips64 lib-bootstrap
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
2014-06-09 17:37:46 +08:00
Andrew Hsieh
f6ca3b75de am 397301be: am b71ef233: am ecfe9d09: Merge "64-bit mips64el-* multilib sysroot"
* commit '397301be5ea7f7cb7cf43bb10163a31618aa1829':
  64-bit mips64el-* multilib sysroot
2014-06-09 01:15:14 +00:00
Andrew Hsieh
ecfe9d0946 Merge "64-bit mips64el-* multilib sysroot" 2014-06-09 01:06:34 +00:00
Elliott Hughes
fbc8ae15b2 am 7d1aa271: am 55dc8e65: am 91e2c5dc: Merge "Fix libportable build breakage."
* commit '7d1aa27155b6b6dbac9290d2c073b20be96f3fb4':
  Fix libportable build breakage.
2014-06-08 09:03:18 +00:00
Elliott Hughes
fc9ac9f173 Fix libportable build breakage.
Change-Id: Ic85e36cf55b7486b50fc9f1513f10a8ade5e86e9
2014-06-07 22:24:44 -07:00
Jesse Hall
319d36a9d1 am 6ed7e6df: am ea385828: am 3d1f0837: Merge "ndk: Remove extra GLES symbols on 64-bit platforms"
* commit '6ed7e6dfcc36a41ddface0527d1e4a2c053cc736':
  ndk: Remove extra GLES symbols on 64-bit platforms
2014-06-06 16:37:08 +00:00
Jesse Hall
3bcccf420f ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so
Also update existing GLES2 and GLES3 headers to latest official
Khronos versions.

Bug: 15028495
Change-Id: Iecdc1d2cc23fbe10f225511536fb0bd46d11af4a
2014-06-05 21:28:16 -07:00
Jesse Hall
acda0020dd ndk: Remove extra GLES symbols on 64-bit platforms
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
2014-06-05 21:28:00 -07:00
Jesse Hall
2433ffdef5 ndk: Remove extra GLES symbols on 64-bit platforms
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
2014-06-05 18:36:32 -07:00
Glenn Kasten
a16dfb7878 Update OpenSLES_Android.h for API 20
All other include/SLES/*.h are unchanged since API 14

Change-Id: If4be7449fc8866ee630dd7986d3ee0d6a48549d4
2014-06-04 12:47:40 -07:00
Andrew Hsieh
f77a689ffd 64-bit mips64el-* multilib sysroot
Change-Id: I88fb4492d16eece4347589da75fe1ed2ed7d2254
2014-06-04 23:42:16 +08:00
Marco Nelissen
ddd6c1d56b NDK files - do not merge
b/15414091

Change-Id: I939dc65f8e34cd19eb42b276ccee23d76f4b0ee7
2014-06-03 17:17:07 -07:00
Andrew Hsieh
d3b356b67d am 172b2a28: am 80bc9315: Merge "Fix warning about undefined __LP64__"
* commit '172b2a282238548d90a0fb35190e3dd066d831fa':
  Fix warning about undefined __LP64__
2014-06-03 11:11:35 +00:00
Andrew Hsieh
880ff4ab33 am be5b713a: am 7f4142f2: Merge "Refresh 64-bit headers/libs (WW22)"
* commit 'be5b713adfef26029b747d4a29ec1a5f54dd596a':
  Refresh 64-bit headers/libs (WW22)
2014-06-03 11:11:25 +00:00
Andrew Hsieh
80bc93153d Merge "Fix warning about undefined __LP64__" 2014-06-03 07:33:17 +00:00
Andrew Hsieh
7f4142f25e Merge "Refresh 64-bit headers/libs (WW22)" 2014-06-03 07:25:05 +00:00
Marco Nelissen
250139f533 Merge "NDK media codec sample" 2014-06-02 16:38:28 +00:00
Andrew Hsieh
818d75e32c am 097f3d62: am 37f7e742: am e7a46c48: Merge "Add lib symlink to x86_64 so that 32-bit static libs are available"
* commit '097f3d628a4b391fcf46cd863a2e1367ef07431b':
  Add lib symlink to x86_64 so that 32-bit static libs are available
2014-06-02 11:45:05 +00:00
Andrew Hsieh
e85f942ec6 Fix warning about undefined __LP64__
See b.android.com/69975

Change-Id: If7f2b6fa29c36221b1a0d31a334cb34cecb4e8bc
2014-06-02 14:44:19 +08:00
Pavel Chupin
2e807e16dc Add lib symlink to x86_64 so that 32-bit static libs are available
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>
2014-06-01 18:52:16 +04:00