Kenny Root
6182008e73
am 88a42f9d: Merge "Fix MIPS build"
...
* commit '88a42f9daf0b081a40f7833875df4b04817319f6':
Fix MIPS build
2013-10-02 18:19:12 -07:00
Kenny Root
88a42f9daf
Merge "Fix MIPS build"
2013-10-03 00:24:00 +00:00
Brian Carlstrom
22c1fdc8f3
Fix MIPS build
...
(cherry picked from commit f9695cbd669fd024d805319a279c7c93db7263dc)
Change-Id: Ife90c3c5094b5b429f81cf0168a2d0c550aae02f
2013-10-02 17:11:57 -07:00
Raphael Moll
382966f30c
am 47605d10: Merge "SDK Repository: switch to sdk addon revision 6."
...
* commit '47605d10f9647d21c3b350e944fe0d0f5efdc4e6':
SDK Repository: switch to sdk addon revision 6.
2013-09-30 16:15:53 -07:00
Raphael Moll
47605d10f9
Merge "SDK Repository: switch to sdk addon revision 6."
2013-09-30 22:22:23 +00:00
Raphael Moll
7657a59083
SDK Repository: switch to sdk addon revision 6.
...
addon-6.xsd changes <extra><revision> from an int (major only)
to a full <revision> element with major.micro.minor (but not
preview part.)
Change-Id: Ia37e75a2c8f86f4ecf36edb218f7e243f66a0b36
2013-09-30 11:57:17 -07:00
Andrew Hsieh
d496950e94
am 06485c81: Merge "Move Teapot to android-17 and set APP_ABI := all"
...
* commit '06485c81bbc79b02acfbe986e378216adab573c2':
Move Teapot to android-17 and set APP_ABI := all
2013-09-17 18:58:25 -07:00
Andrew Hsieh
06485c81bb
Merge "Move Teapot to android-17 and set APP_ABI := all"
2013-09-18 01:55:54 +00:00
Andrew Hsieh
016338e0ec
am 3199e150: Merge "Fixed array-index-out-of-bound in Teapot sample"
...
* commit '3199e1502382a037e6bb9b3ae11429fc18fe9917':
Fixed array-index-out-of-bound in Teapot sample
2013-09-17 18:38:45 -07: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
539c54da92
am cfb3c3ff: Merge "Fix sample bitmap-plasma to draw on whole screen"
...
* commit 'cfb3c3ff05c9eacecfa60f68a2a0128b344a0cba':
Fix sample bitmap-plasma to draw on whole screen
2013-09-13 04:36:07 -07:00
Andrew Hsieh
6cb8f77156
am eb0b5623: Merge "Fix error about multiple unsequenced modifications"
...
* commit 'eb0b56233947b32d8ebaa29db3103cbe2072fd49':
Fix error about multiple unsequenced modifications
2013-09-13 04:35:56 -07: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
18bdd9b22a
am 83e093e9: Merge "Add NDK sample to demonstrate more OpenGL&Gaming related technologies."
...
* commit '83e093e9a2f7c428b85e013d10cf20eb204d0062':
Add NDK sample to demonstrate more OpenGL&Gaming related technologies.
2013-09-13 00:35:53 -07: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
14ebb41700
am 445765eb: Merge "Fix issue 58135 about _C_LABEL_STRING macro w/o space between literal in C++"
...
* commit '445765ebe5887dccb9c93973024e9e59563adb8d':
Fix issue 58135 about _C_LABEL_STRING macro w/o space between literal in C++
2013-09-06 04:44:14 -07: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
09d77363b4
am 7d80bf6a: Merge "arch-specific diff of header"
...
* commit '7d80bf6ab4e0df5049ccfc241bfb1408bf2e2931':
arch-specific diff of header
2013-09-06 01:35:41 -07: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
bd58d76107
am 19c6555d: Merge "Update NDK\'s android headers"
...
* commit '19c6555d9deed3fb77ac2a76b2861e49542533c9':
Update NDK's android headers
2013-08-29 18:24:50 -07: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
fa73c847c3
am 54723fb6: Merge "Remove missing functions imaxabs() and imaxdiv() from inttypes.h"
...
* commit '54723fb6ac38cbefd2dbaf8c1e7a892765170d4c':
Remove missing functions imaxabs() and imaxdiv() from inttypes.h
2013-08-12 20:29:07 -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
Stephen Hines
c76a715ffa
am 295fc719: am 94efbd63: Add bcc_compat to sdk.atree to fix build break.
...
* commit '295fc719be1a30177b274eccc21acf3a678aaeb9':
Add bcc_compat to sdk.atree to fix build break.
2013-08-06 18:44:25 -07:00
Stephen Hines
295fc719be
am 94efbd63: Add bcc_compat to sdk.atree to fix build break.
...
* commit '94efbd635de732a57fc6de360f4ec8080bec8c31':
Add bcc_compat to sdk.atree to fix build break.
2013-08-06 18:42:35 -07:00
Stephen Hines
94efbd635d
Add bcc_compat to sdk.atree to fix build break.
...
Change-Id: Iaccd5654aca64b249e9805844099fc4724b6b07e
2013-08-06 18:18:27 -07:00
Stephen Hines
6a368cd3dc
am 147fd9b2: am d50554a5: Add bcc_compat to list of required SDK product packages.
...
* commit '147fd9b2766cd020475d143dc6c1b0a65b85318d':
Add bcc_compat to list of required SDK product packages.
2013-08-06 18:15:42 -07:00
Stephen Hines
147fd9b276
am d50554a5: Add bcc_compat to list of required SDK product packages.
...
* commit 'd50554a5ca4aa1b046f1e7cfc2fd08a27a30d92a':
Add bcc_compat to list of required SDK product packages.
2013-08-06 18:14:00 -07:00
Stephen Hines
d50554a5ca
Add bcc_compat to list of required SDK product packages.
...
Change-Id: I890e6461672ffbaf589b72bac02d5c09ef2b370e
2013-08-06 17:41:46 -07:00
Stephen Hines
d18bec202b
am 6ee70b1c: am 4483ade6: Add frameworks/rs and bcc_compat to windows SDK whitelist.
...
* commit '6ee70b1c040c061293fbc79dd5ec0773ffbd3f29':
Add frameworks/rs and bcc_compat to windows SDK whitelist.
2013-08-06 13:39:27 -07:00
Stephen Hines
6ee70b1c04
am 4483ade6: Add frameworks/rs and bcc_compat to windows SDK whitelist.
...
* commit '4483ade6b23878e54a5c2932f04310f611420151':
Add frameworks/rs and bcc_compat to windows SDK whitelist.
2013-08-06 13:35:44 -07:00
Alan Viverette
19142864e8
am 1cb84db2: Merge "Add RTL support in Support4Demos manifest, fix DrawerLayout sample" into jb-mr2-ub-dev
...
* commit '1cb84db2c9279dc82d9580c6c4f8542f77515c96':
Add RTL support in Support4Demos manifest, fix DrawerLayout sample
2013-08-06 11:13:20 -07:00
Alan Viverette
1cb84db2c9
Merge "Add RTL support in Support4Demos manifest, fix DrawerLayout sample" into jb-mr2-ub-dev
2013-08-06 18:11:11 +00:00
Alan Viverette
c7c384b4f6
Add RTL support in Support4Demos manifest, fix DrawerLayout sample
...
Change-Id: I1152ad6e49a1b1dc88a70f701bf7ed2fe882e242
2013-08-06 11:10:22 -07:00
Mindy DelliCarpini
73a124536a
am 28a1e658: Merge "Add sample for new ContentLoadingProgressBar." into jb-mr2-ub-dev
...
* commit '28a1e658c9c028fb5ab239f439cf5b28cc2fe9e9':
Add sample for new ContentLoadingProgressBar.
2013-08-06 09:32:52 -07:00
Mindy DelliCarpini
28a1e658c9
Merge "Add sample for new ContentLoadingProgressBar." into jb-mr2-ub-dev
2013-08-06 15:58:22 +00:00
Andrew Hsieh
7a07b9d8ee
am 52d66144: Merge "Update mips crtfiles from bionic with C versions"
...
* commit '52d6614480085b2b91f7ffe4d73475bc94e1769c':
Update mips crtfiles from bionic with C versions
2013-08-05 18:26:13 -07:00
Andrew Hsieh
5626ae5ef2
am cb4fcab5: Merge "Add minimal supports to build multilib x86 toolchain with OpenMP"
...
* commit 'cb4fcab5c495d4350b0fc2b547089da605f5a1c2':
Add minimal supports to build multilib x86 toolchain with OpenMP
2013-08-05 18:26:13 -07: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