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