Commit Graph

8277 Commits

Author SHA1 Message Date
The Android Automerger
472c11c4fa merge in gingerbread-release history after reset to gingerbread 2011-03-18 10:41:30 -07:00
David Li
9e05cfa929 Merge "GLES2Debugger: Make command exchange async to improve performance." 2011-03-17 14:38:44 -07:00
Xavier Ducrohet
cd3b989893 am c66f8c18: am d73e1584: Add android-support-v4.jar to the apidemo samples in the SDK package.
* commit 'c66f8c1880d1ae18f8c09822b21e4bc42590c156':
  Add android-support-v4.jar to the apidemo samples in the SDK package.
2011-03-17 12:51:28 -07:00
Xavier Ducrohet
c66f8c1880 am d73e1584: Add android-support-v4.jar to the apidemo samples in the SDK package.
* commit 'd73e1584d5898c9c976ec0eeabf4131ddea8ea50':
  Add android-support-v4.jar to the apidemo samples in the SDK package.
2011-03-17 12:49:35 -07:00
Xavier Ducrohet
d73e1584d5 Add android-support-v4.jar to the apidemo samples in the SDK package.
Change-Id: I07a9723152ffc4f08bbfd254e886986ec0429509
2011-03-17 12:10:10 -07:00
The Android Automerger
f58e3ccf21 merge in gingerbread-release history after reset to gingerbread 2011-03-17 05:43:46 -07:00
Scott Main
46d6742ae2 am 12821396: am 900a1c1c: am 62c9b6cb: Merge "fix density sample to state density type rather than screen size" into honeycomb
* commit '128213967bddd8f0190baac3494de33d7792b7e9':
  fix density sample to state density type rather than screen size
2011-03-16 12:36:01 -07:00
Scott Main
128213967b am 900a1c1c: am 62c9b6cb: Merge "fix density sample to state density type rather than screen size" into honeycomb
* commit '900a1c1cf1b6cbf6672f2261f7f65ffce65ce02e':
  fix density sample to state density type rather than screen size
2011-03-16 12:18:21 -07:00
Scott Main
900a1c1cf1 am 62c9b6cb: Merge "fix density sample to state density type rather than screen size" into honeycomb
* commit '62c9b6cb1479c24e07bc81b61b77905d13998b41':
  fix density sample to state density type rather than screen size
2011-03-16 12:13:58 -07:00
Scott Main
62c9b6cb14 Merge "fix density sample to state density type rather than screen size" into honeycomb 2011-03-16 12:03:07 -07:00
Scott Main
882b22d698 fix density sample to state density type rather than screen size
Change-Id: I3d8fd592c914c648b9ebb19fd585f7a20a882427
2011-03-16 10:30:17 -07:00
David Turner
3b20e47efd am f375d1f6: am 091b78c2: am 7ba56321: Merge "Emugen : A tool to generate wire protocol code"
* commit 'f375d1f63cbe92095a65766b75bdeabbe2fe0388':
  Emugen : A tool to generate wire protocol code
2011-03-16 08:43:39 -07:00
David Turner
f375d1f63c am 091b78c2: am 7ba56321: Merge "Emugen : A tool to generate wire protocol code"
* commit '091b78c2030d77bc9ae3fb8d692efa2efe31b3f8':
  Emugen : A tool to generate wire protocol code
2011-03-16 08:39:08 -07:00
David Turner
091b78c203 am 7ba56321: Merge "Emugen : A tool to generate wire protocol code"
* commit '7ba563216a352e430928dc970fb1018fcf6e5ecc':
  Emugen : A tool to generate wire protocol code
2011-03-16 08:26:20 -07:00
David Turner
7ba563216a Merge "Emugen : A tool to generate wire protocol code" 2011-03-16 07:55:55 -07:00
Jacky Romano
9760e2863a Emugen : A tool to generate wire protocol code
Emugen is a tool that can be used to generate code that
deals with marshaling/unmarshaling request to/from a wire-protocol.
Its input is an API defintion files and its output is C++ source
code for the client (caller) and the server (callee) sides.

See README file for more details.

This submission is resubmission of code that lived under
sdk/emulator/opengl/. However, it also includes minor updates
in ApiGen.cpp

Change-Id: I0ede7448e0a0e26fa0fbc5590d07d1f2f6566f0a
2011-03-16 15:58:23 +02:00
The Android Automerger
3c0533bba6 merge in gingerbread-release history after reset to gingerbread 2011-03-16 05:43:28 -07:00
Xavier Ducrohet
bf725f2750 am 9c63bb35: am 07815cd0: Remove the pre-made notice file from platform-tools.
* commit '9c63bb358c36f7fe3611aa8e54ac74412624a84c':
  Remove the pre-made notice file from platform-tools.
2011-03-15 23:50:25 -07:00
Xavier Ducrohet
9c63bb358c am 07815cd0: Remove the pre-made notice file from platform-tools.
* commit '07815cd01d90bde943c7d418322898d9e1a82c6e':
  Remove the pre-made notice file from platform-tools.
2011-03-15 23:47:06 -07:00
Xavier Ducrohet
07815cd01d Remove the pre-made notice file from platform-tools.
A change in build.git now puts the one that's automatically
generated.

Change-Id: Idced9ea6176152400189203b84809c9a5a3fd92e
2011-03-15 13:29:38 -07:00
David 'Digit' Turner
64afc658c5 am a7414978: am 799afe8a: am c5db1533: Merge "Fix pwrite() declaration in NDK platform headers."
* commit 'a74149786dd7ea48b257337d6c22e19f52a30b45':
  Fix pwrite() declaration in NDK platform headers.
2011-03-15 12:57:23 -07:00
David 'Digit' Turner
a74149786d am 799afe8a: am c5db1533: Merge "Fix pwrite() declaration in NDK platform headers."
* commit '799afe8aa310cdb5604f15662a1964a647725c2e':
  Fix pwrite() declaration in NDK platform headers.
2011-03-15 12:52:49 -07:00
David 'Digit' Turner
799afe8aa3 am c5db1533: Merge "Fix pwrite() declaration in NDK platform headers."
* commit 'c5db153329b20274fdf52f18afb68d598def7076':
  Fix pwrite() declaration in NDK platform headers.
2011-03-15 12:50:02 -07:00
David 'Digit' Turner
c5db153329 Merge "Fix pwrite() declaration in NDK platform headers." 2011-03-15 12:30:33 -07:00
David 'Digit' Turner
9ad28785ba Fix pwrite() declaration in NDK platform headers.
The corresponding fix is already in the Bionic libc source tree.

See http://code.google.com/p/android/issues/detail?id=8908

Change-Id: Id1329f996cd6708e46f48d33d998b8b3d26bf5d7
2011-03-15 16:30:35 +01:00
The Android Automerger
bb6f5c8c4d merge in gingerbread-release history after reset to gingerbread 2011-03-14 22:33:30 -07:00
Iliyan Malchev
62c656f89a Merge "development: remove LOCAL_PRELINK_MODULE" 2011-03-14 16:58:50 -07:00
David Li
6e1d354d06 Merge changes I91604740,Ibe105b60
* changes:
  Added state tracking and vertex data capturing.
  Initial commit of OpenGL ES 2.0 Debugger Client
2011-03-14 15:17:53 -07:00
Iliyan Malchev
1dcd97644a development: remove LOCAL_PRELINK_MODULE
Change-Id: I6ae5c92aba05c3991bda260c264de835244f7f3e
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-03-14 14:24:21 -07:00
David 'Digit' Turner
18e7d562a3 am fbd686b0: am a1ae75c8: am 2876ff6b: Merge "emulator: Move platform-specific modules to development.git"
* commit 'fbd686b031afa84ffc8ca055a91d0f0732dccf62':
  emulator: Move platform-specific modules to development.git
2011-03-14 12:09:36 -07:00
Ying Wang
fb0f70fc20 am 65140fc2: am ff3d4bc4: resolved conflicts for merge of 1a6a849b to gingerbread-plus-aosp
* commit '65140fc2fca019dc3602134a4bc2b579178b52e0':
  Disable ccache when use mingw.
2011-03-14 12:05:35 -07:00
David 'Digit' Turner
5d9393f555 am b2c8dbea: am 5ac5e8d7: Merge "ndk: Fix stdint.h definitions for C++"
* commit 'b2c8dbeafb93d87ce877529c508c1911d6a9fcf6':
  ndk: Fix stdint.h definitions for C++
2011-03-14 12:05:33 -07:00
David 'Digit' Turner
fbd686b031 am a1ae75c8: am 2876ff6b: Merge "emulator: Move platform-specific modules to development.git"
* commit 'a1ae75c868ffb1171ba0f3b3644c84b571a3dbce':
  emulator: Move platform-specific modules to development.git
2011-03-14 11:50:48 -07:00
Ying Wang
65140fc2fc am ff3d4bc4: resolved conflicts for merge of 1a6a849b to gingerbread-plus-aosp
* commit 'ff3d4bc42b22093695896bc319c59b139aa2c6f6':
  Disable ccache when use mingw.
2011-03-14 10:53:48 -07:00
David 'Digit' Turner
b2c8dbeafb am 5ac5e8d7: Merge "ndk: Fix stdint.h definitions for C++"
* commit '5ac5e8d7b5c4707190d367c827a7562b08c8e50d':
  ndk: Fix stdint.h definitions for C++
2011-03-14 10:53:18 -07:00
David 'Digit' Turner
a1ae75c868 am 2876ff6b: Merge "emulator: Move platform-specific modules to development.git"
* commit '2876ff6b931989d8943311412465d2b849c5e2a2':
  emulator: Move platform-specific modules to development.git
2011-03-14 10:25:24 -07:00
David 'Digit' Turner
2876ff6b93 Merge "emulator: Move platform-specific modules to development.git" 2011-03-14 09:42:01 -07:00
The Android Automerger
21696b004d merge in gingerbread-release history after reset to gingerbread 2011-03-12 11:56:03 -08:00
Ying Wang
40d2f1c878 am 97497302: am b0948c5a: am b058af05: Disable ccache when using mingw.
* commit '974973029a036314077ea5f7c181727ae1e6fddf':
  Disable ccache when using mingw.
2011-03-11 15:14:44 -08:00
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
The Android Automerger
a4cada567d merge in gingerbread-release history after reset to gingerbread 2011-03-11 10:35:15 -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