Commit Graph

425 Commits

Author SHA1 Message Date
Andrew Hsieh
7532860672 am d54e91cf: am a6b673cd: am 37feee2a: Merge "Update mipsel and mips64el multilib lib* and lib-bootstrap"
* commit 'd54e91cf9bbaa0177935998c30b00661b151b5e8':
  Update mipsel and mips64el multilib lib* and lib-bootstrap
2015-03-20 21:46:20 +00:00
Andrew Hsieh
9458778b69 am dee2e870: am 430b78ad: am 37351fdd: Merge "Remove symlink ndk/platforms/android-L/arch-mips64/lib"
* commit 'dee2e870e610797586d08886cbae9d85fbfa06c0':
  Remove symlink ndk/platforms/android-L/arch-mips64/lib
2015-03-20 21:46:17 +00:00
Andrew Hsieh
2bb6217430 am 6bdc9677: am 61aaedb2: am 488f2392: Merge "getSampletime -> getSampleTime"
* commit '6bdc96770e00b9b6c647c4f2be8071d50065439b':
  getSampletime -> getSampleTime
2015-03-20 21:46:14 +00:00
Andrew Hsieh
6d678f448b am 7086c5c4: am b240fe6d: am 2918193e: Merge "Media NDK files"
* commit '7086c5c4a7e485e81eff59c9be91c5740e4cedcc':
  Media NDK files
2015-03-20 21:46:10 +00:00
Andrew Hsieh
eabf6d7714 am 7cde60b2: am 37b64790: am 8092009a: Merge "NDK media codec sample"
* commit '7cde60b29ee82fdd9df505e265b9b404f6c7d7ec':
  NDK media codec sample
2015-03-20 21:46:04 +00:00
Andrew Hsieh
23edb84ae7 am 61e5e463: am b74edf6b: am 6fdc2791: Merge "ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so"
* commit '61e5e463f5fd66a69bfb3b525d793a272286cc32':
  ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so
2015-03-20 21:46:01 +00:00
Andrew Hsieh
4359c008d3 am 2cd1f4ce: am 2097b3b7: am 8839697e: Merge "Update OpenSLES_Android.h for API L"
* commit '2cd1f4cec35bd1f044152beee2364c2202ce9b53':
  Update OpenSLES_Android.h for API L
2015-03-20 21:45:58 +00:00
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
Andrew Hsieh
d54e91cf9b am a6b673cd: am 37feee2a: Merge "Update mipsel and mips64el multilib lib* and lib-bootstrap"
* commit 'a6b673cd97ac0bdb28e041cff431167fc70e534d':
  Update mipsel and mips64el multilib lib* and lib-bootstrap
2014-07-17 12:59:55 +00:00
Andrew Hsieh
dee2e870e6 am 430b78ad: am 37351fdd: Merge "Remove symlink ndk/platforms/android-L/arch-mips64/lib"
* commit '430b78ad742811338c62394f74608322db6e7dec':
  Remove symlink ndk/platforms/android-L/arch-mips64/lib
2014-07-17 12:59:54 +00:00
Andrew Hsieh
6bdc96770e am 61aaedb2: am 488f2392: Merge "getSampletime -> getSampleTime"
* commit '61aaedb278afed833d19a51eeda23fa61e71d9f9':
  getSampletime -> getSampleTime
2014-07-17 12:59:53 +00:00
Andrew Hsieh
7086c5c4a7 am b240fe6d: am 2918193e: Merge "Media NDK files"
* commit 'b240fe6de0e2e61bb97a2569e583148b11e2d1d3':
  Media NDK files
2014-07-17 12:59:52 +00:00
Andrew Hsieh
7cde60b29e am 37b64790: am 8092009a: Merge "NDK media codec sample"
* commit '37b647901798727c01a9bbc5960060ec4880a47a':
  NDK media codec sample
2014-07-17 12:59:50 +00:00
Andrew Hsieh
61e5e463f5 am b74edf6b: am 6fdc2791: Merge "ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so"
* commit 'b74edf6b28ce6b852f0938f751f5b7331079e2eb':
  ndk: Add GLES 3.1 and AEP extensions to NDK libGLESv3.so
2014-07-17 12:59:49 +00:00
Andrew Hsieh
2cd1f4cec3 am 2097b3b7: am 8839697e: Merge "Update OpenSLES_Android.h for API L"
* commit '2097b3b7e705753d7d5737f04cd133b941e79486':
  Update OpenSLES_Android.h for API L
2014-07-17 12:59:48 +00:00
Marco Nelissen
ba5926ec3e NDK media codec sample
Change-Id: Id7e70cfccdace8bce253bdac4434c42f52ff72f3
2014-07-17 15:29:09 +08:00
Jesse Hall
22d95914d5 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-07-17 15:20:39 +08:00
Glenn Kasten
5c939bfd32 Update OpenSLES_Android.h for API L
All other include/SLES/*.h are unchanged since API 14

Change-Id: If4be7449fc8866ee630dd7986d3ee0d6a48549d4
2014-07-17 15:13:15 +08:00
Andrew Hsieh
d10a35fe44 Update mipsel and mips64el multilib lib* and lib-bootstrap
Needed by:
  https://android-review.googlesource.com/#/c/101410
  https://android-review.googlesource.com/#/c/101022

Change-Id: Ia5f96fa2ee91984cba12983c9fb01a6b2e584209
2014-07-17 16:24:51 +08:00
Andrew Hsieh
8b4f4331b7 Remove symlink ndk/platforms/android-L/arch-mips64/lib
This is for coming CL which replaces symlink lib with physical directory.
Somehow android-review.googlesource.com dislikes removal of
symlink and addition of physical directory appear in the same CL

Change-Id: I42a06761d940ef74859bf3bf8f6bb12667863a1e
2014-07-17 16:20:21 +08:00
Marco Nelissen
7a2be752cb getSampletime -> getSampleTime
Change-Id: I089adb8a4050fe72befe272318a903ef93744335
2014-07-17 15:31:43 +08:00
Marco Nelissen
cf8a4a67a5 Media NDK files
Change-Id: Ie41df1949abde194156ab188a662ec7065343d54
2014-07-17 15:31:04 +08:00
Dmitriy Ivanov
859ffba812 am 95c0db1e: am ce3b58a6: Merge "Update dlext.h header"
* commit '95c0db1e7f598599c204840e7d417b661ef42974':
  Update dlext.h header
2014-07-14 16:23:23 +00:00
Andrew Hsieh
5d8817f5d5 am f22634e3: am 1d3c5d4b: am dd524f0c: Merge "Refresh 64-bit headers/libs (WW28)"
* commit 'f22634e3b22590fde355143ea6c1437c713b7bee':
  Refresh 64-bit headers/libs (WW28)
2014-07-11 16:18:54 +00:00
Andrew Hsieh
70aad0665b am e19c8d59: am e087f83a: am 26e306d9: Merge "Update mips64 lib-bootstrap"
* commit 'e19c8d59b8bb3f8eb5718184c99ddd5048ee4199':
  Update mips64 lib-bootstrap
2014-07-11 16:18:51 +00:00
Andrew Hsieh
3eb82eca45 am 1c7d5d11: am 344f76dc: am 630a1be4: Merge "Remove symlink lib-boostrap"
* commit '1c7d5d11c73946bd1ff86ad49aa9123a1111610e':
  Remove symlink lib-boostrap
2014-07-11 16:18:49 +00: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
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