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
Raphael
002acfc342
Merge "Fix XMLNS detection in SDK Repo XSD files."
2011-03-25 16:35:04 -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
The Android Automerger
8eeabf5d53
merge in gingerbread-release history after reset to gingerbread
2011-03-25 14:31:41 -07:00
Raphael
3ea87ca65f
Fix XMLNS detection in SDK Repo XSD files.
...
Change-Id: I7e804c1d7de2db9428d53242c146e15f4c2fcc15
2011-03-25 14:25:03 -07:00
Jamie Gennis
8d52aeb684
Merge "GLES2Dbg: Remove spurious execute file permissions."
2011-03-25 11:07:23 -07:00
David 'Digit' Turner
1ca79b3497
am 8edebe1f: am 4712e4eb: Merge "qemud: disable debug traces"
...
* commit '8edebe1f2877bb0e64321342ff3984e2ab9ab2c3':
qemud: disable debug traces
2011-03-25 08:49:37 -07:00
David 'Digit' Turner
8edebe1f28
am 4712e4eb: Merge "qemud: disable debug traces"
...
* commit '4712e4eb1421867bcd0e61d0cc51662fc56a7938':
qemud: disable debug traces
2011-03-25 08:39:28 -07:00
David 'Digit' Turner
4712e4eb14
Merge "qemud: disable debug traces"
2011-03-25 08:24:58 -07:00
The Android Automerger
2c5109295c
merge in gingerbread-release history after reset to gingerbread
2011-03-25 06:04:22 -07:00
Raphael
7a8e0399c6
am 86f738ab: am 473fad03: (-s ours) Merge "Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge."
...
* commit '86f738abccb61c820d50a3a50d1fd1f0f2745c84':
Merge 48023786cf : 'Generate SDK Repository XML.' Do not merge.
2011-03-24 22:44:03 -07:00
Raphael
8ad7417748
am 2a610080: am 878796e9: (-s ours) Merge "Merge 2ff496b8a1: \'Build SDK repository.\' Do not merge."
...
* commit '2a6100802234fbbe0643d11ecc8a874096ab9f0f':
Merge 2ff496b8a1 : 'Build SDK repository.' Do not merge.
2011-03-24 22:43:59 -07:00
Raphael
86f738abcc
am 473fad03: (-s ours) Merge "Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge."
...
* commit '473fad031584363bfd011b51522b819cf62d79d3':
Merge 48023786cf : 'Generate SDK Repository XML.' Do not merge.
2011-03-24 22:39:32 -07:00
Raphael
2a61008022
am 878796e9: (-s ours) Merge "Merge 2ff496b8a1: \'Build SDK repository.\' Do not merge."
...
* commit '878796e999792bf9632cbdbb2f97d7214f212b93':
Merge 2ff496b8a1 : 'Build SDK repository.' Do not merge.
2011-03-24 22:39:29 -07:00
Raphael
473fad0315
Merge "Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge."
2011-03-24 22:23:20 -07:00
Raphael
878796e999
Merge "Merge 2ff496b8a1: 'Build SDK repository.' Do not merge."
2011-03-24 22:23:16 -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
Raphael
922ee89a69
Merge 2ff496b8a1: 'Build SDK repository.' Do not merge.
...
When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.
Change-Id: I671e8ff1bc2a6e9f5c097241d65da1cfdde21154
2011-03-24 13:07:30 -07:00
Raphael
56c341295a
Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
...
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: I4f60d3197cac8c22027534cb7686de087ddf1a90
2011-03-24 11:20:16 -07:00
Raphael
9eec951059
Merge 2ff496b8a1: 'Build SDK repository.' Do not merge.
...
When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.
Change-Id: I1c4a120616697383792d7fb1b328cfcefac0b2f5
2011-03-24 11:09:43 -07:00
David 'Digit' Turner
5f64d75d1d
qemud: disable debug traces
...
They're verbose and unuseful during normal usage.
Change-Id: Ia5e2fb89b0a4844ce911a735078efdafb56bc1b4
2011-03-24 17:14:44 +01:00
The Android Automerger
58c1534b81
merge in gingerbread-release history after reset to gingerbread
2011-03-24 08:48:48 -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
The Android Automerger
d974b0b95f
merge in gingerbread-release history after reset to gingerbread
2011-03-23 05:42:55 -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
The Android Automerger
8641e41f35
merge in gingerbread-release history after reset to gingerbread
2011-03-22 13:10:16 -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
Tim Wan
eb02d8daa6
Enable lcd backlight in the emulator.
...
Adding a new lights.goldfish.so library to enable
lcd backlight in the emulator
Change-Id: I2a6c8af268859d7d30fd90b60ac2a0fe0d9625e8
2011-03-22 13:57:01 +01:00
The Android Automerger
ff7d8798cc
merge in gingerbread-release history after reset to gingerbread
2011-03-22 05:43:12 -07: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
The Android Automerger
1e6265a593
merge in gingerbread-release history after reset to gingerbread
2011-03-21 05:42:00 -07:00
The Android Automerger
5bcedd7fb4
merge in gingerbread-release history after reset to gingerbread
2011-03-18 17:35:14 -07: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