Commit Graph

12056 Commits

Author SHA1 Message Date
Andrew Hsieh
06485c81bb Merge "Move Teapot to android-17 and set APP_ABI := all" 2013-09-18 01:55:54 +00:00
Andrew Hsieh
3199e15023 Merge "Fixed array-index-out-of-bound in Teapot sample" 2013-09-18 01:36:02 +00:00
Andrew Hsieh
1b8ffe3331 Move Teapot to android-17 and set APP_ABI := all
For the default configuration to run on more devices: ARM/Intel/MIPS >= API17

Change-Id: I52145374d0c51624c7a295dc8092f8492e591dee
2013-09-16 10:32:55 +08:00
Iceberg Fu
f74a8b0a63 Fixed array-index-out-of-bound in Teapot sample
Fix issue used to crash on MIPS/X86 device.  ARM device works by accident

Change-Id: I401f4954841b6f59d3ea001e5e6a70c46045a7e1
2013-09-16 10:17:17 +08:00
Andrew Hsieh
cfb3c3ff05 Merge "Fix sample bitmap-plasma to draw on whole screen" 2013-09-13 11:34:17 +00:00
Andrew Hsieh
eb0b562339 Merge "Fix error about multiple unsequenced modifications" 2013-09-13 11:34:02 +00:00
Andrew Hsieh
055992fa7d Fix sample bitmap-plasma to draw on whole screen
The previous dimension 200x200 is tiny these days

Change-Id: I7d7a7d93b3e60bd4dcd8a2b22b97fc7ed9ca4dfa
2013-09-13 18:29:42 +08:00
Andrew Hsieh
99da728a3d Fix error about multiple unsequenced modifications
The evaluation order of function args aren't gaurenteed in C++

jni/NDKSupport/vecmath.h:869:32: warning: multiple unsequenced modifications to 'i' [-Wunsequenced]
        LOGI("%f %f %f %f", f[i++], f[i++], f[i++], f[i++]);

Change-Id: Ibf69978dd3abf57a7042624aad3d416a0f6f5e01
2013-09-13 17:47:47 +08:00
Andrew Hsieh
83e093e9a2 Merge "Add NDK sample to demonstrate more OpenGL&Gaming related technologies." 2013-09-13 07:33:26 +00:00
Hak Matsuda
f39a078023 Add NDK sample to demonstrate more OpenGL&Gaming related technologies.
Change-Id: I0fb56c1fd1aa82d5a7c4da5010e00e103146ba78
2013-09-13 15:12:22 +08:00
Andrew Hsieh
445765ebe5 Merge "Fix issue 58135 about _C_LABEL_STRING macro w/o space between literal in C++" 2013-09-06 11:42:04 +00:00
Andrew Hsieh
c2e61c3c01 Fix issue 58135 about _C_LABEL_STRING macro w/o space between literal in C++
Change-Id: Iefc3c090071f3629998515d43907139b07105672
2013-09-06 17:34:31 +08:00
Andrew Hsieh
7d80bf6ab4 Merge "arch-specific diff of header" 2013-09-06 08:26:19 +00:00
Andrew Hsieh
d9124876f0 arch-specific diff of header
Change-Id: I78e2186dc7e491095201efc2c709f26e8822a076
2013-09-06 16:25:41 +08:00
Andrew Hsieh
19c6555d9d Merge "Update NDK's android headers" 2013-08-30 01:23:01 +00:00
Michael Wright
f3c3a93bc4 Update NDK's android headers
Change-Id: I2ae3b42dcbbdccbcae018f768dc7b56723416d21
2013-08-29 18:17:46 -07:00
Andrew Hsieh
54723fb6ac Merge "Remove missing functions imaxabs() and imaxdiv() from inttypes.h" 2013-08-13 03:26:13 +00:00
Grigoriy Kraynov
eaf0281f45 Remove missing functions imaxabs() and imaxdiv() from inttypes.h
Bionic does not have actual implementation of those functions.
Further implementations should be introduced in new
API-level in order to prevent break of compatibility.

Change-Id: I0aa65ea28082cf4a88c383ce0d8eceaa5288c027
Signed-off-by: Grigoriy Kraynov <grigoriy.kraynov@intel.com>
2013-08-12 16:31:10 +04:00
Andrew Hsieh
52d6614480 Merge "Update mips crtfiles from bionic with C versions" 2013-08-06 01:21:29 +00:00
Andrew Hsieh
cb4fcab5c4 Merge "Add minimal supports to build multilib x86 toolchain with OpenMP" 2013-08-06 01:21:03 +00:00
Andrew Hsieh
f43a290c1b Update mips crtfiles from bionic with C versions
Copied from bionic but adding back .ctors and .dtors to be
compatible with old Android system linkers.  Otherwise
static executable may segfault.

Change-Id: If834123161744cd2387a2c031a2315e818c2f123
2013-08-05 14:21:06 +08:00
Andrew Hsieh
2070ac6d1c Merge "Add boostrap lib to build multilib x86 GCC with OpenMP support" 2013-08-03 05:47:30 +00:00
Andrew Hsieh
09073f3d88 Add minimal supports to build multilib x86 toolchain with OpenMP
Change-Id: I095c15d2a2de11992890c2a03be0f90332d372de
2013-08-02 17:06:40 +08:00
Andrew Hsieh
aecb5c6d65 Add boostrap lib to build multilib x86 GCC with OpenMP support
Build instructions:

  cd AOSP=<your-AOSP-path>
  cd $AOSP/bionic/libc
  ln -s arch-x86 arch-x86_64

  export NDK=$AOSP/ndk
  cd $NDK
  ./build/tools/gen-platforms.sh --dst-dir=$NDK --ndk-dir=$NDK --overlay --arch=x86_64

  # copy $NDK/platforms/android-9/arch-x86_64/usr/lib, lib64, and libx32 over

Change-Id: I021a34fa139456540bc0afdb1d9636df165f92fe
2013-08-02 14:34:01 +08:00
Andrew Hsieh
18dc709e82 Merge "Fix gles3jni build with clang at android-11" 2013-08-01 00:32:31 +00:00
Andrew Hsieh
80c93fbede Fix gles3jni build with clang at android-11
jni/gl3stub.c:21:5: error: implicit declaration of function 'eglGetProcAddress' is invalid in C99
    FIND_PROC(glReadBuffer);
    ^
jni/gl3stub.c:20:37: note: expanded from macro 'FIND_PROC'
    #define FIND_PROC(s) s = (void*)eglGetProcAddress(#s)
                                    ^
1 error generated.

Change-Id: I907f33e3d88f3e96bf7958102e90bf15529748b9
2013-07-31 13:27:23 +08:00
Andrew Hsieh
445331f5e1 Merge "Add TCP_INFO state enum values." 2013-07-30 03:19:29 +00:00
Andrew Hsieh
65675341ac Add TCP_INFO state enum values.
See b.android.com/38881 and fix in bionic
0dff43cab41e4a0bd5bd018584952c68cb224977

Change-Id: I2417fe3cf43919bf363f36c337ea6813f13699d8
2013-07-29 20:15:57 -07:00
Andrew Hsieh
7a85c344ff Merge "Update x86 crtfiles from bionic with C versions" 2013-07-30 00:43:58 +00:00
Pavel Chupin
e5c9f8ec5a Update x86 crtfiles from bionic with C versions
Files are copied as is from bionic head.
Also adding arch-x86_64 symlink to be able to generate arch-x86_64
crtfiles/libs.

Change-Id: I0b40c1c19bb4e3b24b25fa2bcb9236469fa32a3e
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
2013-07-25 20:55:38 +04:00
Andrew Hsieh
f05c9f97b3 am 85f9f764: Merge "Workaround for libportable wait4 implementation."
* commit '85f9f764507761e011fc14398e7ddf08b5d383c5':
  Workaround for libportable wait4 implementation.
2013-07-22 12:14:00 -07:00
Andrew Hsieh
85f9f76450 Merge "Workaround for libportable wait4 implementation." 2013-07-22 19:11:18 +00:00
Andrew Hsieh
54009f7e95 am 5d774594: Merge "ndk: Fix WCHAR_MIN / WCHAR_MAX definitions."
* commit '5d7745946dfc76dc2c82ef4ff097dedd8913e393':
  ndk: Fix WCHAR_MIN / WCHAR_MAX definitions.
2013-07-22 09:30:19 -07:00
Andrew Hsieh
5d7745946d Merge "ndk: Fix WCHAR_MIN / WCHAR_MAX definitions." 2013-07-22 16:28:08 +00:00
David 'Digit' Turner
fe8625d401 ndk: Fix WCHAR_MIN / WCHAR_MAX definitions.
This fixes WCHAR_MIN / WCHAR_MAX to be signed / unsigned based on
the target ABI.

This only impacts ARM where wchar_t is really 'unsigned int'.
One can define _WCHAR_IS_ALWAYS_SIGNED to restore the old behaviour.

See http://b.android.com/55749

Change-Id: Idb63b7b11aecd3cfee37f5b6dd2eba78b308876f
2013-07-20 00:56:53 +02:00
Andrew Hsieh
2bb3bd5a59 am e96f2b6a: am 66623113: Merge "[MIPS] Add missing REAL macros."
* commit 'e96f2b6a5a93bbcd631070d5f1e82c8b7f845cee':
  [MIPS] Add missing REAL macros.
2013-07-15 09:38:06 -07:00
Andrew Hsieh
e96f2b6a5a am 66623113: Merge "[MIPS] Add missing REAL macros."
* commit '66623113fa2192374220e3df25fc040fa0ab6ade':
  [MIPS] Add missing REAL macros.
2013-07-15 09:35:13 -07:00
Andrew Hsieh
66623113fa Merge "[MIPS] Add missing REAL macros." 2013-07-15 16:31:38 +00:00
Lai Wei-Chih
db279bedd6 [MIPS] Add missing REAL macros.
Change-Id: If396e16a759d90f94213deb536f3d1c9dcb6c132
2013-07-15 10:09:06 +08:00
The Android Open Source Project
116ae7da76 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I14f58bf34aaf5bc683334aa8fc0859fa8044c69d
2013-07-11 08:23:49 -07:00
The Android Automerger
38d9178d35 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-11 05:55:14 -07:00
Jesse Hall
2bfb93da26 am 4b571253: Merge "Load ES3 functions with eglGetProcAddress, not dlsym" into jb-mr2-dev
* commit '4b571253095629540ecee414caa9e601ec304e6a':
  Load ES3 functions with eglGetProcAddress, not dlsym
2013-07-10 09:36:09 -07:00
Jesse Hall
4b57125309 Merge "Load ES3 functions with eglGetProcAddress, not dlsym" into jb-mr2-dev 2013-07-10 16:32:48 +00:00
The Android Open Source Project
8289f1f450 Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I9629362dd810549cdaad8633361e761b81fc9d5c
2013-07-10 08:34:34 -07:00
The Android Automerger
93e117c68d merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-10 05:55:10 -07:00
Jeff Brown
77707d620d am 8b51a39f: Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev
* commit '8b51a39fda458039e68b650eb46f90b95f4bddca':
  Revert "Remove mediarouter v7 support library from SDK."
2013-07-09 16:52:35 -07:00
Jeff Brown
8b51a39fda Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev 2013-07-09 23:44:58 +00:00
Jesse Hall
b7a2e33c11 Load ES3 functions with eglGetProcAddress, not dlsym
Using dlopen/dlsym works, but eglGetProcAddress is a little easier and
more consistent with how GL extension functions (rather than these
non-extension functions) are loaded.

Change-Id: I082c193f08f7d5456389ab783a06cd38a9632d53
2013-07-09 11:31:33 -07:00
The Android Open Source Project
044f46062a Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ief25c7aea75b2548938c669ca239d5178039a3f2
2013-07-09 09:37:00 -07:00
The Android Automerger
edeeb6356c merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-09 05:55:17 -07:00