Commit Graph

30 Commits

Author SHA1 Message Date
Android (Google) Code Review
d89d9b37a0 am 5ea0a94: Merge change 657 into donut
Merge commit '5ea0a9436cda662264cc0dcf92d3559d532383bb'

* commit '5ea0a9436cda662264cc0dcf92d3559d532383bb':
  Fix a memory deallocation error that was crashing q2dm.
2009-04-29 12:06:41 -07:00
Jack Veenstra
8b496573a9 Fix a memory deallocation error that was crashing q2dm.
Also fix a bunch of compile warnings by changing "char *" to "const char *".
2009-04-28 13:03:22 -07:00
David Turner
d29b8649ce Merge branch 'readonly-p4-master' 2009-04-18 20:51:56 -07:00
David Turner
d3b2e5bb5e AI 146565: am: CL 146315 am: CL 146314 modify GSM emulation to accomodate 1.0 and 1.1 system images.
without this, networking doesn't work well when using the 1.1 add-on with
  the cupcake sdk
  Original author: digit
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 146565
2009-04-18 20:50:39 -07:00
David Turner
240094a972 AI 146315: am: CL 146314 modify GSM emulation to accomodate 1.0 and 1.1 system images.
without this, networking doesn't work well when using the 1.1 add-on with
  the cupcake sdk
  Original author: digit
  Merged from: //branches/cupcake/...

Automated import of CL 146315
2009-04-15 06:50:15 -07:00
Dianne Hackborn
bbdb536500 Merge branch 'readonly-p4-master' 2009-04-13 16:13:25 -07:00
Dianne Hackborn
171499090f AI 145994: Integrate #145778 from Donut.
Automated import of CL 145994
2009-04-13 16:11:52 -07:00
Andy Stadler
e1a5a9bf5d AI 145778: Manual merge changes 145382-145384 from cupcake.
Automated import of CL 145778
2009-04-10 16:24:46 -07:00
David Turner
119bbaef05 Merge branch 'readonly-p4-master' 2009-04-05 14:24:32 -07:00
David Turner
d4e48c3aa4 AI 144597: am: CL 144596 am: CL 144595 Fix the AVD configuration code to support "sdcard.path" in config.ini to indicate an explicit SD Card image file (instead of using the one in the content directory)
Note that this also fix a bug where the SD Card image was not properly locked in the previous implementation.
  Allow the http-proxy support code to actually manage to receive chunked encoding data, instead of complaining needlessly.
  Introduce a new CharBuffer object that is used indirectly by "-radio <hostdevice>" and "-gps <hostdevice>" options
  Add new documentation for QEMUD and CharDriverState objects
  Update the Audio documentation with ASCII graphics (because I'm an artist too)
  Original author: digit
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 144597
2009-04-05 14:23:05 -07:00
David Turner
d7484a2ff5 AI 144596: am: CL 144595 Fix the AVD configuration code to support "sdcard.path" in config.ini to indicate an explicit SD Card image file (instead of using the one in the content directory)
Note that this also fix a bug where the SD Card image was not properly locked in the previous implementation.
  Allow the http-proxy support code to actually manage to receive chunked encoding data, instead of complaining needlessly.
  Introduce a new CharBuffer object that is used indirectly by "-radio <hostdevice>" and "-gps <hostdevice>" options
  Add new documentation for QEMUD and CharDriverState objects
  Update the Audio documentation with ASCII graphics (because I'm an artist too)
  Original author: digit
  Merged from: //branches/cupcake/...

Automated import of CL 144596
2009-04-05 14:22:25 -07:00
Mike Lockwood
923043d3fc AI 143355: am: CL 143204 am: CL 142988 Remove emulator support from user builds.
Saves us 52K in /system partition.
  BUG=1739507
  Original author: lockwood
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143355
2009-03-27 19:08:42 -07:00
Mike Lockwood
f5171c1aa7 AI 143204: am: CL 142988 Remove emulator support from user builds.
Saves us 52K in /system partition.
  BUG=1739507
  Original author: lockwood
  Merged from: //branches/cupcake/...

Automated import of CL 143204
2009-03-27 17:53:21 -07:00
The Android Open Source Project
3838ad5b07 Merge commit 'korg/cupcake' 2009-03-27 15:30:35 -07:00
Mike Lockwood
d7f1b57f48 Automated import from //branches/cupcake/...@142988,142988 2009-03-26 14:44:25 -07:00
Scott Tsai
eda65f5f60 q2dm: correctly expect the return type of strchr(const char*) to be
'const char*' in C++ so that the code builds on gcc-4.4

ISO C++ overloads strchr() so that strchr(const char*) return 'const
char*' and strchr(char *) return 'char *'.
Since DmTrace::parseAndAddFunction really wants to write to its 'const
char *name' argument I just casted a pointer pointing inside of 'name' to 'char*'
2009-03-21 08:17:41 +08:00
Scott Tsai
0c4ee7741c Correctly expect the return value of rindex(const char*) to be of type
'const char*' to make the code build on gcc-4.4.

The C++ spec overloads string fucntions like strtsr and rindex so that
rindex(char *) returns 'char*' and rindex(const char*) returns 'const
char*'.
Without this patch you get an "invalid conversion from ‘const char*’ to
‘char*’" error on gcc-4.4
2009-03-21 07:41:30 +08:00
The Android Open Source Project
6ffae015b4 auto import from //branches/cupcake_rel/...@140373 2009-03-18 17:39:43 -07:00
Jean-Baptiste Queru
3e2a2d312a Merge commit 'remotes/korg/cupcake' into cupcake_to_master 2009-03-18 16:57:28 -07:00
The Android Open Source Project
243d18eb22 auto import from //branches/cupcake/...@137873 2009-03-11 12:11:54 -07:00
The Android Open Source Project
52d4c30ca5 auto import from //depot/cupcake/@135843 2009-03-03 19:29:09 -08:00
The Android Open Source Project
d4aee0c0ca auto import from //depot/cupcake/@135843 2009-03-03 18:28:16 -08:00
android-build SharedAccount
db1b7a2e17 Merge branch 'cupcake' 2009-01-15 16:15:47 -08:00
The Android Open Source Project
b8d704a517 auto import from //branches/cupcake/...@126645 2009-01-15 16:12:07 -08:00
The Android Open Source Project
e60601ff6b auto import from //branches/cupcake/...@125939 2009-01-09 18:26:25 -08:00
The Android Open Source Project
95cf464c5a auto import from //branches/cupcake/...@125939 2009-01-09 17:51:19 -08:00
Jean-Baptiste Queru
303a8c73c9 Merge commit 'remotes/korg/cupcake'
Conflicts:
	build/sdk.atree
	ide/eclipse/.classpath
	tools/activitycreator/src/com/android/activitycreator/ActivityCreator.java
	tools/eclipse/scripts/create_adt_symlinks.sh
	tools/eclipse/scripts/create_all_symlinks.sh
	tools/eclipse/scripts/create_bridge_symlinks.sh
	tools/eclipse/scripts/create_common_symlinks.sh
	tools/eclipse/scripts/create_ddms_symlinks.sh
	tools/eclipse/scripts/create_editors_symlinks.sh
	tools/eclipse/scripts/create_test_symlinks.sh
	tools/scripts/build.template
2008-12-19 08:04:59 -08:00
The Android Open Source Project
e943f2fd8e Code drop from //branches/cupcake/...@124589 2008-12-17 18:04:04 -08:00
Alexey Zaytsev
62da4d9357 Add a few missing headers
Fixes build with gcc 4.3.2 on Debian.

Signed-off-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>
2008-10-22 02:03:57 +04:00
The Android Open Source Project
5c11852110 Initial Contribution 2008-10-21 07:00:00 -07:00