Andrew Hsieh
7980acf254
Remove duplicated definitions of size_t and ssize_t
...
See 3975cec694a0c9b42e3f7e671fcd678da92836c3
Change-Id: Ia40ff8de3ffe923fb983bb116b740942724c641a
2012-12-21 22:29:26 +08:00
Andrew Hsieh
852b358185
Merge "Sync pthread.h and resolv.h"
2012-12-20 10:38:07 -08:00
Andrew Hsieh
9ca4e48605
Sync pthread.h and resolv.h
...
See 9831ad3ce6bd5b22da16a275ed67e7236eae3d1f and
23d3e6b21b4b6debff87da8c6558495e564cc38e
Change-Id: I22c7bbda1cd763e5f67410cc2e4054292e71af04
2012-12-20 19:08:54 +08:00
Andrew Hsieh
e4b3c7a31d
Merge "Correct typo"
2012-12-12 15:02:04 -08:00
Andrew Hsieh
4bddb6f5f7
Merge "Fix <endian.h> and <sys/endian.h>"
2012-12-12 05:38:32 -08:00
Andrew Hsieh
d30385fc7c
Correct typo
...
Change-Id: I150ee24f93d1a4fe16de938dafb335a9f1a171b0
2012-12-12 10:34:21 +08:00
Andrew Hsieh
ab13dd0e7a
Fix <endian.h> and <sys/endian.h>
...
See 4fa35d8ae80c175425e9525831d7b6a71a3ada60
Change-Id: Ia14386f2e762fd7c0a1fc8f3e7cf8c0ce05b1dd5
2012-12-12 10:04:53 +08:00
Raphael Moll
d8aa2895f4
Merge "SDK: fix sdk_repo build."
2012-12-10 13:17:16 -08:00
Raphael Moll
437419089c
SDK: fix sdk_repo build.
...
The makefile for sdk_repo looks for the repository/addon XSD files in the tree,
these paths needed to be adjusted due to the recent reorganization.
Change-Id: I50120542f78dc72da51b4d5377214c064ec68c01
2012-12-10 13:06:52 -08:00
Andrew Hsieh
0f30dd0d19
Merge "Fix warning compiling samples with clang3.1"
2012-12-06 04:51:55 -08:00
Andrew Hsieh
4ba2dd5080
Fix warning compiling samples with clang3.1
...
Change-Id: I166cc64d34dcf8dd99fc28f2556306b8795e3c7e
2012-12-06 18:10:46 +08:00
Andrew Hsieh
aa33ae38ae
Merge "Refresh endian.h"
2012-12-05 21:28:13 -08:00
Andrew Hsieh
25be7400a9
Merge "Fix a ENOTUP/ENOTSUP typo"
2012-12-05 05:03:32 -08:00
Andrew Hsieh
ef48154850
Fix a ENOTUP/ENOTSUP typo
...
See ecb53eab4b63a777c189f880e7f88ebbe0e8101b
Change-Id: Id0cd72f3ccc6e4ecb1bd57045e2f46be234378fa
2012-12-05 13:05:15 +08:00
Andrew Hsieh
7361c3c7bb
Refresh endian.h
...
See http://code.google.com/p/android/issues/detail?id=39824
and b15c58bb0fe55f076751acd7a5d00ded0ec33963
Change-Id: I71858f6d15adb688e0b05685e55582f0f1ddae54
2012-12-05 12:42:18 +08:00
Andrew Hsieh
d613956fdf
Merge "Add missing SL_IID_ANDROIDBUFFERQUEUESOURCE in android-14 for ARM/X86"
2012-12-04 10:50:09 -08:00
Andrew Hsieh
c45fca2926
Add missing SL_IID_ANDROIDBUFFERQUEUESOURCE in android-14 for ARM/X86
...
SL_IID_ANDROIDBUFFERQUEUESOURCE is new in android-14 and already
declared in platforms/android-14/include/SLES/OpenSLES_Android.h,
but it's missing from libOpenSLES.so
It turns out both *.functions.txt and *.variables.txt should exist
for gen-platforms.sh to generate new *.so. Add *.functions.txt otherwise
development/ndk/platforms/android-14/arch-(arm|x86)/symbols/libOpenSLES.so.variables.txt
are ignored. Note that MIPS is correct all along.
See http://code.google.com/p/android/issues/detail?id=40625
Change-Id: I826f13a93c9f3eaf648a59e7e844b53be5f7fba0
2012-12-04 20:23:41 +08:00
Andrew Hsieh
206315bc74
Merge "Bug: __WINT_TYPE__ and wint_t reference to different types"
2012-11-29 19:21:58 -08:00
The Android Open Source Project
a6caaa2e0a
Merge jb-mr1-dev into aosp/master - do not merge
...
Change-Id: Ic92c37b93a5a20e1bed9ec523893b6179378ed4c
2012-11-27 08:21:00 -08:00
Sergey Melnikov
02327e165a
Bug: __WINT_TYPE__ and wint_t reference to different types
...
__WINT_TYPE__ type provided by gcc. It references to unsigned int
type for android and linux. Patch corrects wint_t typedef to
__WINT_TYPE__.
Signed-off-by: Sergey Melnikov <sergey.melnikov@intel.com >
Change-Id: Ib02a808283f91f17c1124fc9e304911659f4af74
2012-11-26 12:01:00 +04:00
Andrew Hsieh
1535354143
Merge "Correct typo"
2012-11-23 01:35:35 -08:00
Andrew Hsieh
19b44fd4b7
Merge "Check the presence of __STDC_VERSION__ in <sys/cdefs.h>"
2012-11-23 01:35:13 -08:00
Andrew Hsieh
6162d4e848
Correct typo
...
See http://code.google.com/p/android/issues/detail?id=15134
Change-Id: I3eeed151949086fa132dc258d43bee21eab4af9b
2012-11-23 17:01:06 +08:00
Andrew Hsieh
28464f3b51
Check the presence of __STDC_VERSION__ in <sys/cdefs.h>
...
See http://code.google.com/p/android/issues/detail?id=14627
and bea05255de
Change-Id: Ie990b7c1df91adab631634e6b68454e4c5bab19d
2012-11-23 12:53:04 +08:00
Andrew Hsieh
3de1121e22
Merge "Refresh header byteswap.h and dirent.h"
2012-11-21 08:14:45 -08:00
Andrew Hsieh
279fe064b1
Refresh header byteswap.h and dirent.h
...
Sync with bionic. No new APIs.
Change-Id: Ie1f71d1c56ce2d0574d8b743f205115d2fbc68b4
2012-11-21 14:17:01 +08:00
Andrew Hsieh
5591a96003
Merge "Fix limits.h to include page.h which provides PAGE_SIZE"
2012-11-20 19:01:09 -08:00
Andrew Hsieh
2eb9332422
Fix limits.h to include page.h which provides PAGE_SIZE
...
See 6331db3fd251ddc350913cc1e8a7941740c25f63 and
http://code.google.com/p/android/issues/detail?id=39983
Change-Id: I85083d754fe9b722efcb8ea73f17d88d505c90d1
2012-11-20 16:14:06 +08:00
Scott Main
f394e166a0
docs: update redirects for articles
...
Change-Id: Ia2db76f0b9cc07878ecdc1e673cd1ae376b0447f
2012-11-16 08:57:44 -08:00
Scott Main
e1e1a999e8
docs: add redirects for best practices pages that moved to training
...
Change-Id: I0dd79fb863d50b0dd2f0f7d53babe345888f0f78
2012-11-15 17:47:44 -08:00
Scott Main
42801496cf
docs: a few bonus redirects for dac
...
Change-Id: I01743d0032ebe707125121e84d741d4d39ca5540
2012-11-14 09:59:12 -08:00
Scott Main
2df7c91d5f
am 87525f60: am 09d8f21c: am e242276c: docs: redirect next steps to building first app class
...
* commit '87525f600943f36697c85c22555463bb199afc2f':
docs: redirect next steps to building first app class
2012-11-12 19:50:56 -08:00
Scott Main
87525f6009
am 09d8f21c: am e242276c: docs: redirect next steps to building first app class
...
* commit '09d8f21c0b9531d1d2615a737b256da4f29d27bf':
docs: redirect next steps to building first app class
2012-11-12 19:47:51 -08:00
Scott Main
09d8f21c0b
am e242276c: docs: redirect next steps to building first app class
...
* commit 'e242276c5b021c6219b31e9a40e126b633f15deb':
docs: redirect next steps to building first app class
2012-11-12 19:45:49 -08:00
Andy Stadler
18bc76ab25
Cleanup eclipse .classpath for Gallery2
...
A couple of minor fixes to make eclipse happy.
Change-Id: Id9a30778efd3ef18e45efe316402971ca72a7c60
2012-11-12 14:40:23 -08:00
Andy Stadler
a103fc1e4e
Cleanup eclipse .classpath for Gallery2
...
A couple of minor fixes to make eclipse happy.
Change-Id: Id9a30778efd3ef18e45efe316402971ca72a7c60
2012-11-12 13:42:25 -08:00
The Android Open Source Project
37ca54d2a2
am 62ea063d: am 7cb8e4ae: Reconcile with jb-mr1-release - do not merge
...
* commit '62ea063df0c96ff549e1fe6d4bbdbf4836f23d3d':
2012-11-08 06:26:56 -08:00
Xavier Ducrohet
0a5b159698
am 42a111e5: am 9350dd44: am 85c1f088: revert API 17 system image to rev 1.
...
* commit '42a111e579f2de6c834573285409a47d842c4057':
revert API 17 system image to rev 1.
2012-11-08 06:14:20 -08:00
The Android Open Source Project
dcec4836a7
am 3902e196: am f2701a8a: Reconcile with jb-mr1-release - do not merge
...
* commit '3902e1967eacb8211c2805eb4281c555bb0df8d8':
2012-11-08 06:12:38 -08:00
Scott Main
e242276c5b
docs: redirect next steps to building first app class
...
Change-Id: I2cc922573021a6c69d8830ab886b537df28a2a62
2012-11-07 17:47:47 -08:00
The Android Open Source Project
62ea063df0
am 7cb8e4ae: Reconcile with jb-mr1-release - do not merge
...
* commit '7cb8e4ae66a4a9f73ed40576efd5da4d86e9a2a0':
2012-11-07 10:22:12 -08:00
The Android Open Source Project
7cb8e4ae66
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I36e5d6ccd61dc24a395656f7fdf9a6ca3781a331
2012-11-07 10:19:43 -08:00
Andrew Hsieh
a6326ef671
am e67bb3dc: am 0f85f2de: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
...
* commit 'e67bb3dc07975413341087727dd797b69fdd5dd2':
Fix return type of glGetAttribLocation and glGetUniformLocation
2012-11-06 20:27:15 -08:00
Andrew Hsieh
e67bb3dc07
am 0f85f2de: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
...
* commit '0f85f2de9c2ba9d764c7774fb826535ed9d148ca':
Fix return type of glGetAttribLocation and glGetUniformLocation
2012-11-06 20:24:52 -08:00
Andrew Hsieh
0f85f2de9c
Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
2012-11-06 20:16:34 -08:00
The Android Automerger
f893fe7ac1
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-11-06 18:03:53 -08:00
Xavier Ducrohet
42a111e579
am 9350dd44: am 85c1f088: revert API 17 system image to rev 1.
...
* commit '9350dd44e3516251d88661e298b80f9f9fc1d8e5':
revert API 17 system image to rev 1.
2012-11-06 17:13:23 -08:00
Xavier Ducrohet
9350dd44e3
am 85c1f088: revert API 17 system image to rev 1.
...
* commit '85c1f0880d5d8ac8fab41dc141eba3e5495bedcd':
revert API 17 system image to rev 1.
2012-11-06 17:09:19 -08:00
Xavier Ducrohet
85c1f0880d
revert API 17 system image to rev 1.
...
Change-Id: I6e28fd4567f8c99eaca86b328d10d616317cf5d8
2012-11-06 15:27:49 -08:00
Andrew Hsieh
18fc7183ea
Fix return type of glGetAttribLocation and glGetUniformLocation
...
from int to GLint.
See:
https://android-review.googlesource.com/#/c/46120
http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetAttribLocation.xml
http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetUniformLocation.xml
Change-Id: I57fa430be2987b41e31fb6b3bcefa5dfb58e63b9
2012-11-06 13:52:56 -08:00