Commit Graph

5815 Commits

Author SHA1 Message Date
David Turner
44b79c9579 am 411f741d: am 4621d1a8: am 18ddf41d: Merge "Add x86 qemu"
* commit '411f741d905a174a7f9e315efe7fe7e31f55589b':
  Add x86 qemu
2011-03-25 16:39:03 -07:00
David Turner
411f741d90 am 4621d1a8: am 18ddf41d: Merge "Add x86 qemu"
* commit '4621d1a82ce5bb3196c82cb164e7b56521f3a7d2':
  Add x86 qemu
2011-03-25 15:51:22 -07:00
Jamie Gennis
8d52aeb684 Merge "GLES2Dbg: Remove spurious execute file permissions." 2011-03-25 11:07:23 -07:00
Jaikumar Ganesh
5c3aac7074 Merge "Modify Bluetooth Porting page image." 2011-03-24 17:17:14 -07:00
Jaikumar Ganesh
f7c1d6f04f Modify Bluetooth Porting page image.
Change-Id: I2c0fcd033957826b7cc5b66c72d6ec2f808d3838
2011-03-24 17:13:06 -07:00
Jaikumar Ganesh
5081289ad0 Merge "Update Bluetooth documentation." 2011-03-24 15:36:03 -07:00
Jaikumar Ganesh
4e9067c8d2 Update Bluetooth documentation.
Change-Id: I491afbbc73e3705d57c3af2781151ce767acd7c9
2011-03-24 13:57:34 -07:00
Brian Muramatsu
3c0c736422 Update Link for CTS 2.2_r5
Bug 4128048

Change-Id: I9c43dddf0151dd01837a5c0d5aa683e73af86f9d
2011-03-23 12:45:27 -07:00
Jamie Gennis
548c959907 GLES2Dbg: Remove spurious execute file permissions.
This change is just a chmod -x of some files that shouldn't aren't
executable.

Change-Id: I6599f73d474e6ddadff2df6289c75e4e136219fe
2011-03-22 15:10:47 -07:00
Xavier Ducrohet
a500a941ec am 6f06f575: am 57931c3d: Move samples to 12.
* commit '6f06f5755a13c50ced9d36b799dfce1d6957216f':
  Move samples to 12.
2011-03-22 11:42:33 -07:00
David Turner
4621d1a82c am 18ddf41d: Merge "Add x86 qemu"
* commit '18ddf41d5d11729c58fbbfbe0f22e7c5888a1751':
  Add x86 qemu
2011-03-22 06:10:31 -07:00
David Turner
18ddf41d5d Merge "Add x86 qemu" 2011-03-22 06:03:34 -07:00
Bruce Beare
60f5414658 Add x86 qemu
Change-Id: Ic0bfcacd5834f9c2345d7fc0c45528da321f0f7f
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Author: Jun Nakajima <jun.nakajima@intel.com>
2011-03-22 14:02:45 +01:00
Xavier Ducrohet
6f06f5755a am 57931c3d: Move samples to 12.
* commit '57931c3ddb4dece3541cb3f1ccfd71aca5920a52':
  Move samples to 12.
2011-03-21 18:16:00 -07:00
Xavier Ducrohet
57931c3ddb Move samples to 12.
Change-Id: Ic56f5f9e59ce601db37b593b2e715793f6c3473c
2011-03-21 17:38:04 -07:00
David 'Digit' Turner
360270d5e9 am 5aaf5c28: am 282bd952: am 9dacf7ee: Merge "Fix two incorrect <android/input.h> function declarations."
* commit '5aaf5c288c34853725a3bed4d369d25108073101':
  Fix two incorrect <android/input.h> function declarations.
2011-03-21 07:51:41 -07:00
David 'Digit' Turner
5aaf5c288c am 282bd952: am 9dacf7ee: Merge "Fix two incorrect <android/input.h> function declarations."
* commit '282bd952be2e15391d7e33fa0a9ffab378d374ca':
  Fix two incorrect <android/input.h> function declarations.
2011-03-21 07:44:29 -07:00
David 'Digit' Turner
282bd952be am 9dacf7ee: Merge "Fix two incorrect <android/input.h> function declarations."
* commit '9dacf7ee76a54333c0774eb8c870a3d8b2ef6c5d':
  Fix two incorrect <android/input.h> function declarations.
2011-03-21 07:10:57 -07:00
David 'Digit' Turner
9dacf7ee76 Merge "Fix two incorrect <android/input.h> function declarations." 2011-03-21 06:30:06 -07:00
David 'Digit' Turner
9d0136004f Fix two incorrect <android/input.h> function declarations.
The <android/input.h> header file provided with the NDK contained
two invalid function declarations. This patch fixes them.

Note that this breaks the API, but fixes the ABI (which was previously
broken). It is likely that any application developer that tried to use
these function had problems with them anyway.

Another patch to ndk.git will add a note to the changelog and to
the documentation to explain the issue.

+ Fix some documentation typos.

Change-Id: I0f4517458257ff3242127de9f9099f39948c0a56
2011-03-21 13:57:12 +01:00
Romain Guy
dd10148325 am 595d6f08: (-s ours) am bc411cdd: Merge 520c90cc from master. do not merge.
* commit '595d6f085b01ace24f06595a10107d222de07cf1':
  Merge 520c90cc from master. do not merge.
2011-03-18 17:02:10 -07:00
Romain Guy
595d6f085b am bc411cdd: Merge 520c90cc from master. do not merge.
* commit 'bc411cdd0233914f5fbab34e8e43fd98732f416b':
  Merge 520c90cc from master. do not merge.
2011-03-18 16:56:49 -07:00
Romain Guy
bc411cdd02 Merge 520c90cc from master. do not merge.
Don't crash because of hardware acceleration.

Change-Id: I70554d5c7637b768cf815bb9f57a5d3e2c49066d
2011-03-18 16:20:28 -07:00
Romain Guy
0be43bd2b1 Merge "Don't crash because of hardware acceleration." 2011-03-18 15:13:50 -07:00
Romain Guy
520c90cce1 Don't crash because of hardware acceleration.
Change-Id: If4cc213edba643aea82051e66e995d2258da91f8
2011-03-18 15:11:16 -07:00
Raphael
48023786cf Generate SDK Repository XML.
When the "sdk_repo" modified is used during the SDK build,
this also generates the repository.xml and addon.xml files
for the new SDK repository packages and places them in
the DIST_DIR.

Example usage:
  make -j 16 PRODUCT-sdk-sdk showcommands sdk_repo dist DIST_DIR=/dist/sdk
  make -j 16 PRODUCT-google_sdk-sdk_addon showcommands sdk_repo dist DIST_DIR=/dist/addon

Change-Id: Ibaad66f4b1cc476a4146afde7087a10a0557f74c
2011-03-18 13:35:03 -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
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
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
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