Commit Graph

697 Commits

Author SHA1 Message Date
Andrew Hsieh
3c54c7fe34 am f168847e: am 5ece6240: am 348e3402: Merge "Refresh 64-bit headers/libs (WW31)"
* commit 'f168847ece40758925ff2b1bdf283a06f9fdd663':
  Refresh 64-bit headers/libs (WW31)
2015-03-20 21:48:56 +00:00
Andrew Hsieh
efe7a324f4 am 4bfb4d31: am c59b1400: am 0efeb2c6: Merge "Fix the name of the native app glue lib in a header comment"
* commit '4bfb4d3100659dd51bd0d0779de3b2d5d1ee635b':
  Fix the name of the native app glue lib in a header comment
2015-03-20 21:48:35 +00:00
Andrew Hsieh
ce3a6697bb am 5f34909a: am 093774e6: am b50f8f66: Merge "Add APP_ABI for module-exports sample"
* commit '5f34909a36c6be05506cb936cd683b9ec0be8e26':
  Add APP_ABI for module-exports sample
2015-03-20 21:47:46 +00:00
Andrew Hsieh
09eb012a12 am 7eedf0e8: am 41c21169: am 30c2909f: Merge "Refresh 64-bit headers/libs (WW29)"
* commit '7eedf0e8dbd63c631790bb7e8e6236b5b1571e8d':
  Refresh 64-bit headers/libs (WW29)
2015-03-20 21:47:31 +00:00
Andrew Hsieh
402885d781 am 126032dd: am 8e1ad1c9: am fa902f33: Merge "Fix gl3stub.h"
* commit '126032ddaeb694770e576a0e4b9c7e91a7e553b9':
  Fix gl3stub.h
2015-03-20 21:47:27 +00:00
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
f168847ece am 5ece6240: am 348e3402: Merge "Refresh 64-bit headers/libs (WW31)"
* commit '5ece62409b0961b97efdb6034250b336bd57c65b':
  Refresh 64-bit headers/libs (WW31)
2014-08-04 03:10:17 +00:00
Andrew Hsieh
348e340245 Merge "Refresh 64-bit headers/libs (WW31)" 2014-08-01 15:55:34 +00:00
Andrew Hsieh
b4ddea108f Refresh 64-bit headers/libs (WW31)
Change-Id: If08781ae4ca14710a95d6bd0bd61477e0a472293
2014-07-30 14:18:12 +08:00
Andrew Hsieh
4bfb4d3100 am c59b1400: am 0efeb2c6: Merge "Fix the name of the native app glue lib in a header comment"
* commit 'c59b1400fdf39d126d668513449af12dc8ad9646':
  Fix the name of the native app glue lib in a header comment
2014-07-28 02:16:22 +00:00
Martin Storsjo
4ff22dcdcb Fix the name of the native app glue lib in a header comment
The incorrect name is misleading and confusing.

Change-Id: I4040d7bc10370c440401dd9de7e1fc472830287a
2014-07-27 22:15:58 +03:00
Andrew Hsieh
5f34909a36 am 093774e6: am b50f8f66: Merge "Add APP_ABI for module-exports sample"
* commit '093774e6e6772ad38a7da1692daa3e0c9fd08d66':
  Add APP_ABI for module-exports sample
2014-07-21 13:09:57 +00:00
Andrew Hsieh
7eedf0e8db am 41c21169: am 30c2909f: Merge "Refresh 64-bit headers/libs (WW29)"
* commit '41c211692c969e88f04a3b6ae30ecadc0367c9eb':
  Refresh 64-bit headers/libs (WW29)
2014-07-21 12:22:52 +00:00
Andrew Hsieh
126032ddae am 8e1ad1c9: am fa902f33: Merge "Fix gl3stub.h"
* commit '8e1ad1c94d9fcdda363be5b1c1d5eb573785ea1f':
  Fix gl3stub.h
2014-07-21 12:22:46 +00:00
Andrew Hsieh
b50f8f6612 Merge "Add APP_ABI for module-exports sample" 2014-07-17 22:52:20 +00:00
Arseniy Antonov
22359ed8bf Add APP_ABI for module-exports sample
Add APP_ABI := all
to be able to compile this sample for all platforms
without additional manual manipulations.

Change-Id: I8ebb98c86dae2f6e926885b6d70d306ceca33d1f
Signed-off-by: Arseniy Antonov <arseniy.antonov@intel.com>
2014-07-21 16:51:46 +04:00
Andrew Hsieh
30c2909f51 Merge "Refresh 64-bit headers/libs (WW29)" 2014-07-17 22:52:20 +00:00
Andrew Hsieh
cc101e0860 Refresh 64-bit headers/libs (WW29)
Change-Id: Ifaee25e70db14327c6f8104b04bf3abd71493477
2014-07-19 16:03:48 +08: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
Andrew Hsieh
36dea383df Fix gl3stub.h
Only define the following before android-L (where new headers define
them already)

  typedef khronos_int64_t  GLint64;
  typedef khronos_uint64_t GLuint64;
  typedef struct __GLsync *GLsync;

Also define L to 9999 for crtbrand.c which needs it to be an integer

Change-Id: I9ed957d70b85cd1cdfeacf11f77203b39c93023d
2014-07-17 16:32:05 +08: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