Commit Graph

456 Commits

Author SHA1 Message Date
Andrew Hsieh
3e2c075fa2 am 6174c4c4: am 53a20e54: am a8c78c38: Merge "Refresh android-L headers/libs (WW37)"
* commit '6174c4c43710a29fea752e0cf99356c6e40bea74':
  Refresh android-L headers/libs (WW37)
2014-09-16 08:48:00 +00:00
Andrew Hsieh
6174c4c437 am 53a20e54: am a8c78c38: Merge "Refresh android-L headers/libs (WW37)"
* commit '53a20e5434ca973ef06fab5a93e85a08b5e0efa1':
  Refresh android-L headers/libs (WW37)
2014-09-15 22:01:53 +00:00
Andrew Hsieh
0fd7f83fce Refresh android-L headers/libs (WW37)
Change-Id: Ibdb7bebe7a0f73e767b7c62d1f603679163e768c
2014-09-12 13:49:48 -07:00
Andrew Hsieh
c09e2f14a0 am edae4b9e: am 01b6a398: am 9b87a973: Merge "Remove __signalfd4 from 32-bit ABIs; remove basename_r and dirname_r from 64-bit ABIs"
* commit 'edae4b9e6a4fb4b7bc7fd4b4c0d6146839555fde':
  Remove __signalfd4 from 32-bit ABIs; remove basename_r and dirname_r from 64-bit ABIs
2014-09-09 01:03:23 +00:00
Andrew Hsieh
edae4b9e6a am 01b6a398: am 9b87a973: Merge "Remove __signalfd4 from 32-bit ABIs; remove basename_r and dirname_r from 64-bit ABIs"
* commit '01b6a398f71e2a11edeef1b15402a0efb75725f3':
  Remove __signalfd4 from 32-bit ABIs; remove basename_r and dirname_r from 64-bit ABIs
2014-09-09 00:47:24 +00:00
Andrew Hsieh
4aac23afde am 69dd152b: am 817e663d: am d715bffe: Merge "Fixed atexit()"
* commit '69dd152bc3bcba967e1e4620c839f1dacfe9c2b7':
  Fixed atexit()
2014-09-08 03:11:05 +00:00
Andrew Hsieh
2edb4d7bed am 02fe8832: am 2143196a: am 01a406c8: Merge "Fix build with sensor.h"
* commit '02fe88322eec6d58fcc69feff38b4558f7a4ab5f':
  Fix build with sensor.h
2014-09-08 03:11:04 +00:00
Andrew Hsieh
fc4f976d1b am 59a3902a: am 0ff0fef9: am 371b6dbe: Merge "ptrace(3) should be varargs"
* commit '59a3902aadfb8efcc7f90abeb38c2532d4c50a81':
  ptrace(3) should be varargs
2014-09-08 03:11:03 +00:00
Andrew Hsieh
37aa4734f2 am 3e1de653: am 6200d7a4: am b1e7c7b0: Merge "Add __gnuc_va_list in stdio.h to stop gcc from generating include-fixed/stdio.h"
* commit '3e1de653fda035a53fd27ec121a1e72d4d372727':
  Add __gnuc_va_list in stdio.h to stop gcc from generating include-fixed/stdio.h
2014-09-08 03:11:02 +00:00
Andrew Hsieh
92cdb771d1 am 611d66bb: am 289d24e0: am fb7bcce6: Merge "Add back arc4random_stir for 32-bit android-L"
* commit '611d66bbf56fac051bb2e19dd39525b326a18b46':
  Add back arc4random_stir for 32-bit android-L
2014-09-08 03:11:01 +00:00
Andrew Hsieh
69dd152bc3 am 817e663d: am d715bffe: Merge "Fixed atexit()"
* commit '817e663dbfe998557c38f1c73d74257371a34754':
  Fixed atexit()
2014-09-08 03:05:34 +00:00
Andrew Hsieh
02fe88322e am 2143196a: am 01a406c8: Merge "Fix build with sensor.h"
* commit '2143196a09f5100a00f68f3292b9cc3ae7733248':
  Fix build with sensor.h
2014-09-08 03:05:32 +00:00
Andrew Hsieh
59a3902aad am 0ff0fef9: am 371b6dbe: Merge "ptrace(3) should be varargs"
* commit '0ff0fef97bd9cb9c5d9f42b2c348e19d68dfc20a':
  ptrace(3) should be varargs
2014-09-08 03:05:31 +00:00
Andrew Hsieh
3e1de653fd am 6200d7a4: am b1e7c7b0: Merge "Add __gnuc_va_list in stdio.h to stop gcc from generating include-fixed/stdio.h"
* commit '6200d7a45d9b1e433d135107cdb85c2753f22a7c':
  Add __gnuc_va_list in stdio.h to stop gcc from generating include-fixed/stdio.h
2014-09-08 03:05:28 +00:00
Andrew Hsieh
611d66bbf5 am 289d24e0: am fb7bcce6: Merge "Add back arc4random_stir for 32-bit android-L"
* commit '289d24e09a72d41c7c2675969083b0e755efa787':
  Add back arc4random_stir for 32-bit android-L
2014-09-08 03:05:03 +00:00
Andrew Hsieh
65df8d683e Remove __signalfd4 from 32-bit ABIs; remove basename_r and dirname_r from 64-bit ABIs
Change-Id: Iee4bf016a0e929209143ec3fa79d542d34fd8917
2014-09-07 19:44:00 -07:00
Andrew Hsieh
d715bffe04 Merge "Fixed atexit()" 2014-09-08 02:37:17 +00:00
Andrew Hsieh
01a406c8ee Merge "Fix build with sensor.h" 2014-09-08 02:37:06 +00:00
Andrew Hsieh
c6d393c1b2 Fix build with sensor.h
include stdbool.h to define bool for sensor.h

Change-Id: Ic7f57f098f2114b255db0d89fae8c5d16d7c59de
2014-09-04 20:11:46 -07:00
Andrew Hsieh
2db7f63f99 Fixed atexit()
See b.android.com/66595

Change-Id: I1d4c3db424c7f839e48756359cc095a6b1028ace
2014-09-04 13:17:25 -07:00
Andrew Hsieh
83fb2f6940 ptrace(3) should be varargs
See bionic 98b088dce70a2625d5cfa1872e427af5f06bfd99

Change-Id: I9e1993aa41fb8309beb1d653d48c5aacad44e4cd
2014-09-04 13:11:20 -07:00
Andrew Hsieh
6c2d94dfcf Add __gnuc_va_list in stdio.h to stop gcc from generating include-fixed/stdio.h
When GCC is built bionic's stdio.h (among other headers) is fixed: __va_list
is replaced with __gnuc_va_list, and put in include-fixed/stdio.h,
unless stdio.h already contains __gnuc_va_list.  When GCC is later
used bionic's stdio.h is never included.

The problem in the context of NDK is that all 32-bit Android toolchain
are built with android-9 header and expect to work with all API levels
sometime with sustantially different stdio.h.

This CL stops GCC from generating include-fixed/stdio.h by putting
__gnuc_va_list in it.

See bionic df85f50b and b.android.com/73728

Change-Id: I7a490496efbd491a0376608b9ae6e9e2dfc15fb3
2014-09-04 13:00:28 -07:00
Andrew Hsieh
09532ff646 Add back arc4random_stir for 32-bit android-L
See bionic 5dea47221a116aa87b0c286230c944ed6b629636

Change-Id: Id7342a4ea6e21764869d1809a0f75d435baf8ac2
2014-09-04 12:57:06 -07:00
Andrew Hsieh
e3d40345d1 am 3b4aacc2: am dfaca9ff: am 61b90c04: Merge "Refresh 64-bit headers/libs (WW36)"
* commit '3b4aacc247ff3b88d9571e959a0eb9eeb1b179a9':
  Refresh 64-bit headers/libs (WW36)
2014-09-04 18:30:00 +00:00
Andrew Hsieh
787d378044 Remove out-dated android-20 and android-21 now called android-L
Change-Id: I6aae2d2ba9381bc719ad8d9784333409fe379523
2014-09-04 11:25:43 -07:00
Marco Nelissen
f6d2ae9279 Add required permission to sample code
Bug: 15014196
Change-Id: I0edf8320e9eaa02031d564735c17c016d7e14fda
2014-09-04 11:21:03 -07:00
Andrew Hsieh
3b4aacc247 am dfaca9ff: am 61b90c04: Merge "Refresh 64-bit headers/libs (WW36)"
* commit 'dfaca9ff769b05fb66dd1a56861ddb41c98381b0':
  Refresh 64-bit headers/libs (WW36)
2014-09-04 18:18:48 +00:00
Andrew Hsieh
25201b2de1 am a3dcb3f2: am 811fc430: Merge "Update android-L/include/android"
* commit 'a3dcb3f229459b72af97eb7968ef2afee31d9ce0':
  Update android-L/include/android
2014-09-04 17:59:30 +00:00
Andrew Hsieh
61b90c04ed Merge "Refresh 64-bit headers/libs (WW36)" 2014-09-04 17:57:44 +00:00
Andrew Hsieh
3f53b6f2fe Refresh 64-bit headers/libs (WW36)
sync to lmp-dev/bionic 1e010d60397db706cd3d1c4d5701a2bced441aa8

Change-Id: Ieed39d41eb0655d7c8f027bd038be1753a9e56a6
2014-09-03 22:36:28 -07:00
Marco Nelissen
caa3bc3c90 am 5c8a816e: Merge "Add required permission to sample code" into lmp-dev
* commit '5c8a816e781753215be279986764dcdc4dd26b3f':
  Add required permission to sample code
2014-09-02 21:19:35 +00: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
c7f04c38a0 Update android-L/include/android
Added more constants, and 6 new sensor functions

Change-Id: I0b8a028ec948ba66074e949bc20435cb05845a80
2014-08-28 14:29:28 +08: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
b4ddea108f Refresh 64-bit headers/libs (WW31)
Change-Id: If08781ae4ca14710a95d6bd0bd61477e0a472293
2014-07-30 14:18:12 +08: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
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