Ying Wang
974973029a
am b0948c5a: am b058af05: Disable ccache when using mingw.
...
* commit 'b0948c5a6e6615c8d4497b3161d200464edb5297':
Disable ccache when using mingw.
2011-03-11 14:18:47 -08:00
Ying Wang
b0948c5a6e
am b058af05: Disable ccache when using mingw.
...
* commit 'b058af052efa1dccf38eef8993008920088ff188':
Disable ccache when using mingw.
2011-03-11 14:11:11 -08:00
Ying Wang
b058af052e
Disable ccache when using mingw.
...
Change-Id: I40ec9f6dfbf54b362b8a87cde7774b396b46b063
2011-03-11 13:59:34 -08:00
Ying Wang
ff3d4bc42b
resolved conflicts for merge of 1a6a849b to gingerbread-plus-aosp
...
Change-Id: I05bf91403b3160ff6db7b9a60b3c1c5f1ded0c5b
2011-03-11 12:59:56 -08:00
David Li
6f85d436f3
GLES2Debugger: Make command exchange async to improve performance.
...
In message loop, use select to check for available commands from client,
rather than always expecting commands in eglSwapBuffers.
Client can send commands at any time.
Change-Id: I607c8fa571a896996c0a3300de904b6e263fc281
Signed-off-by: David Li <davidxli@google.com >
2011-03-11 11:11:41 -08:00
David 'Digit' Turner
5ac5e8d7b5
Merge "ndk: Fix stdint.h definitions for C++"
2011-03-11 09:32:54 -08:00
David 'Digit' Turner
e59bd87056
emulator: Move platform-specific modules to development.git
...
This copies the platform-specific emulator modules from sdk.git into
development.git/tools/emulator/system/. Note the use of guard variables
to prevent clashes when the original modules are still in the tree.
The goal is to submit this and https://review.source.android.com/#change,21737 ,
then later remove the modules from sdk.git when we move the internal sdk branch
to the appropriate tools_rXXX branch.
Change-Id: I762d0efb72d93a935d96c4549f36029c258c3ef9
2011-03-11 16:38:28 +01:00
David 'Digit' Turner
c7d8870875
ndk: Fix stdint.h definitions for C++
...
Fix the stdint.h header for C++ inclusion. The limit and constant related macros
should only be defined if __STDC_LIMIT_MACROS and __STDC_CONSTANT_MACROS are
defined, respectively.
Change-Id: I85b00ed857f40b9c17d530f1405f0f098c5f10f3
2011-03-11 14:42:12 +01:00
Ying Wang
1a6a849bcb
Disable ccache when use mingw.
...
Change-Id: Ieff363f9c4433bba53d1e94a25477c60933666e2
2011-03-10 18:25:51 -08:00
David 'Digit' Turner
35b4a0561a
am c1548712: am 9e17cec2: Merge "ndk: Fixes PTHREAD_RWLOCK_INITIALIZER definition."
...
* commit 'c15487127a8a192ee01d3d1b676eb67ae45c38bb':
ndk: Fixes PTHREAD_RWLOCK_INITIALIZER definition.
2011-03-10 01:59:39 -08:00
David 'Digit' Turner
c15487127a
am 9e17cec2: Merge "ndk: Fixes PTHREAD_RWLOCK_INITIALIZER definition."
...
* commit '9e17cec235cbcd3832722a975e9215bf23b6a9ea':
ndk: Fixes PTHREAD_RWLOCK_INITIALIZER definition.
2011-03-10 01:55:28 -08:00
David 'Digit' Turner
9e17cec235
Merge "ndk: Fixes PTHREAD_RWLOCK_INITIALIZER definition."
2011-03-10 01:26:39 -08:00
David 'Digit' Turner
114db2a1c4
ndk: Fixes PTHREAD_RWLOCK_INITIALIZER definition.
...
This is a fix for http://code.google.com/p/android/issues/detail?id=15306
Also see https://review.source.android.com//#change,21699 for the corresponding
fix in the C library headers.
Change-Id: I1c46ee9fc7eb120a98f47719a0407b81001f5ac0
2011-03-10 10:24:52 +01:00
Jeff Brown
f59cf278e2
am fcaa6857: am 0d4619cc: Merge "Update samples to use new getMotionRanges() API." into honeycomb-mr1
...
* commit 'fcaa6857d133a4c317de30bf394cd2ffaa68fd0a':
Update samples to use new getMotionRanges() API.
2011-03-09 18:39:36 -08:00
Jeff Brown
fcaa6857d1
am 0d4619cc: Merge "Update samples to use new getMotionRanges() API." into honeycomb-mr1
...
* commit '0d4619cc48c4fff03a3a12f121ae55bc848d40d9':
Update samples to use new getMotionRanges() API.
2011-03-09 18:36:43 -08:00
Jeff Brown
0d4619cc48
Merge "Update samples to use new getMotionRanges() API." into honeycomb-mr1
2011-03-09 18:33:55 -08:00
Dianne Hackborn
2f67bee481
am 4d6299be: am 6b3f9b3a: Clean up support library samples.
...
* commit '4d6299be11e4346b6abfe16f71114f3cea34d926':
Clean up support library samples.
2011-03-09 18:07:55 -08:00
Dianne Hackborn
4d6299be11
am 6b3f9b3a: Clean up support library samples.
...
* commit '6b3f9b3ac9327d22e73f4aa2b61e4fb6c3933a33':
Clean up support library samples.
2011-03-09 18:02:59 -08:00
Dianne Hackborn
6b3f9b3ac9
Clean up support library samples.
...
Move them off into their own directory, so it is less confusing to
find them.
Also put in some additional samples -- throttle and arguments.
And add some docs.
Change-Id: I221e56c7ff203934796979bb5ed7ab8835f84b83
2011-03-08 18:18:10 -08:00
Jeff Brown
cb34b7c07a
Update samples to use new getMotionRanges() API.
...
Change-Id: I6b67b7cd1f739b5b52ac32745f52bf0a092480a0
2011-03-08 17:35:22 -08:00
David Li
8b2eabd60d
Added state tracking and vertex data capturing.
...
Change-Id: I91604740aa73a5611f0eb511d02f09a767273700
Signed-off-by: David Li <davidxli@google.com >
2011-03-08 16:57:24 -08:00
David Li
5d710c2629
Initial commit of OpenGL ES 2.0 Debugger Client
...
Displays GL call parameters, textures, screen captures and shader source.
Server code is in frameworks/base/opengl/libs/GLES2_dbg.
Protobuf code is generated using generate_debugger_message_proto.py in server code.
Change-Id: Ibe105b60dbe59af84f721c077d2c138a4d04767e
Signed-off-by: David Li <davidxli@google.com >
2011-03-07 18:27:46 -08:00
Brad Fitzpatrick
4b24a4e810
am 9f06e429: am 6ecf30f2: Merge "Fix SpareParts crash going into battery stats."
...
* commit '9f06e429edf34e6add26a45d9b9ace20d44e0a8c':
Fix SpareParts crash going into battery stats.
2011-03-07 10:52:00 -08:00
Brad Fitzpatrick
9f06e429ed
am 6ecf30f2: Merge "Fix SpareParts crash going into battery stats."
...
* commit '6ecf30f2d8707de4c71272949afc2e6e6818e715':
Fix SpareParts crash going into battery stats.
2011-03-07 10:46:41 -08:00
Jaikumar Ganesh
b8ac11d575
Merge "Update bluetooth documentation."
2011-03-04 16:09:55 -08:00
Brad Fitzpatrick
6ecf30f2d8
Merge "Fix SpareParts crash going into battery stats."
2011-03-04 13:50:59 -08:00
Daniel Sandler
42f58ae22e
am cc6e41a4: am f6ab64af: Merge "Restore CAMERA permission to ApiDemos." into honeycomb-mr1
...
* commit 'cc6e41a44524592c9b477f99fcc738dea7538811':
Restore CAMERA permission to ApiDemos.
2011-03-04 11:38:27 -08:00
Daniel Sandler
cc6e41a445
am f6ab64af: Merge "Restore CAMERA permission to ApiDemos." into honeycomb-mr1
...
* commit 'f6ab64affe8cbd1ab8c163635faa557be58a207a':
Restore CAMERA permission to ApiDemos.
2011-03-04 11:07:51 -08:00
Daniel Sandler
f6ab64affe
Merge "Restore CAMERA permission to ApiDemos." into honeycomb-mr1
2011-03-04 10:42:15 -08:00
Daniel Sandler
6044514d0d
Restore CAMERA permission to ApiDemos.
...
Bug: 3512448
Change-Id: I6a80e7f0f9406e084fec9b626abb19cb24b4fe3d
2011-03-04 10:38:04 -05:00
Doug Zongker
13575201d2
Merge branch 'master' of ssh://android-git:29418/platform/development
2011-03-04 00:29:24 -08:00
Dianne Hackborn
277fd9adf7
am af3c92d5: Merge "New API demo showing arguments to fragments." into honeycomb-mr1
...
* commit 'af3c92d5016bd43c88d0a70d6f43ec7573ec1087':
New API demo showing arguments to fragments.
2011-03-04 00:15:01 -08:00
Andy Stadler
81d4216b79
am 04631234: Add emailcommon to classpath
...
* commit '04631234e920ccae612ac1ef39cf115931701030':
Add emailcommon to classpath
2011-03-04 00:14:59 -08:00
Android Git Automerger
208581903b
Merge branch 'master' of ssh://android-git:29418/platform/development
2011-03-03 22:25:56 -08:00
Dianne Hackborn
af3c92d501
Merge "New API demo showing arguments to fragments." into honeycomb-mr1
2011-03-03 22:23:17 -08:00
Dianne Hackborn
7f308f27bf
New API demo showing arguments to fragments.
...
Change-Id: I5bc41bb23b7ac6a6d7cbbd08cec67879dc4ae2fe
2011-03-03 22:20:11 -08:00
Ed Heyl
2e9c678537
Merge branch 'master' into honeycomb-plus-aosp
2011-03-03 21:48:48 -08:00
Dan Morrill
a773a80f18
NDEF Push Protocol spec PDF
...
Change-Id: I1fcf74d8179bfeff206441b45c7b8327a89d4351
2011-03-03 21:35:39 -08:00
Andy Stadler
04631234e9
Add emailcommon to classpath
...
Change-Id: Ia7ebfbc1c154883f9ace40ce5060a85cf471eaa2
2011-03-03 16:40:26 -08:00
Jaikumar Ganesh
ca0ff53ba0
Update bluetooth documentation.
...
a) Add HC and GB features.
b) Improve qualification message.
Change-Id: I9e023eea5c59438fb990d7464de477c7f51a0dd0
2011-03-03 14:15:19 -08:00
Brian Muramatsu
42cb1a23cc
Add Links to CTS 2.3 R2 and 1.6 R1
...
Bug 3486016
Change-Id: I2fe91aa7333cdaf4553eecd4a95446198d08c89b
2011-03-03 12:12:42 -08:00
Shih-wei Liao
45e0abddcf
Merge "Make AndroidManifest.xml's activity match what's in Java files"
2011-03-02 21:26:25 -08:00
Ying Wang
f566bf1d88
Merge "Add android-support-v4.jar to sdk."
2011-03-02 21:22:59 -08:00
Kenny Root
f57cc7f77b
Merge "Switch demo to use new delete observer"
2011-03-02 08:50:46 -08:00
Shih-wei Liao
7cd58489c9
Make AndroidManifest.xml's activity match what's in Java files
...
Change-Id: I9489d32a715a1aa7f8449495b7c1101a1ad1eac6
2011-03-01 18:21:44 -08:00
Ying Wang
d46eaa6f76
Add android-support-v4.jar to sdk.
...
Change-Id: I28d2a323d31df6b405548e0c73c616eb7b69753d
2011-03-01 17:14:05 -08:00
Xavier Ducrohet
add79697c8
Merge "Add readme to ApiDemos to mention the need for android-support-v4"
2011-03-01 16:45:04 -08:00
Xavier Ducrohet
86eecf0074
Add readme to ApiDemos to mention the need for android-support-v4
...
Change-Id: I3172f4644d41fe1358fd5ae327af03e54e1297b5
2011-03-01 16:32:51 -08:00
Xavier Ducrohet
7aa1c11e67
Fix SDK build.
...
Change-Id: I214048d331c0c9d3885983e588e9313dd3722346
2011-03-01 14:20:35 -08:00
Xavier Ducrohet
e488b3ef67
Put back jar file into compatibility package.
...
Change-Id: I437d3ba7b6fae13815e34a741adadac8e6ecd8f1
2011-03-01 12:07:04 -08:00