Commit Graph

11858 Commits

Author SHA1 Message Date
Xavier Ducrohet
8860250a53 Automated import from //branches/cupcake/...@141808,141808 2009-03-24 18:24:44 -07:00
Brett Chabot
e6a13284e8 Automated import from //branches/cupcake/...@141778,141778 2009-03-24 18:21:57 -07:00
Xavier Ducrohet
7798a83bdf Automated import from //branches/donutburger/...@140722,140722 2009-03-24 18:20:02 -07:00
Xavier Ducrohet
05fcbf1335 Automated import from //branches/master/...@140724,140724 2009-03-24 18:20:00 -07:00
Jeff Hamilton
b10c75c895 Automated import from //branches/cupcake/...@141732,141732 2009-03-24 18:16:44 -07:00
Xavier Ducrohet
ea2f618d74 Automated import from //branches/master/...@140701,140701 2009-03-24 18:15:58 -07:00
Andy McFadden
024d1c2375 Automated import from //branches/donutburger/...@140700,140700 2009-03-24 18:15:56 -07:00
Xavier Ducrohet
f7ddba037d Automated import from //branches/master/...@140698,140698 2009-03-24 18:15:09 -07:00
Xavier Ducrohet
9c03440f19 Automated import from //branches/donutburger/...@140697,140697 2009-03-24 18:15:02 -07:00
Xavier Ducrohet
02c11da47f Automated import from //branches/donutburger/...@140696,140696 2009-03-24 18:14:09 -07:00
Xavier Ducrohet
538e3100be Automated import from //branches/cupcake/...@141592,141592 2009-03-24 17:57:45 -07:00
Brett Chabot
bdbcbcb151 Automated import from //branches/master/...@140469,140469 2009-03-24 17:44:42 -07:00
Brett Chabot
35d5fa877b Automated import from //branches/master/...@140468,140468 2009-03-24 17:44:09 -07:00
Brett Chabot
1d0652bf7b Automated import from //branches/donutburger/...@140466,140466 2009-03-24 17:42:42 -07:00
Brett Chabot
114be91289 Automated import from //branches/donutburger/...@140465,140465 2009-03-24 17:42:09 -07:00
Xavier Ducrohet
41d58c4459 Automated import from //branches/cupcake/...@141556,141556 2009-03-24 17:27:48 -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
b0bdccc71a auto import from //branches/cupcake_rel/...@141571 2009-03-19 23:08:36 -07:00
The Android Open Source Project
700ccfcc01 auto import //branches/master/...@140412 2009-03-18 22:20:25 -07: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
59008ebc2c auto import from //branches/cupcake_rel/...@138607 2009-03-13 13:04:19 -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
692ab02175 auto import from //branches/cupcake/...@137197 2009-03-09 11:52:11 -07:00
The Android Open Source Project
9b690286ca auto import from //depot/cupcake/@136745 2009-03-05 20:00:41 -08:00
The Android Open Source Project
2b83cbdb14 auto import from //depot/cupcake/@136654 2009-03-05 17:04:45 -08:00
The Android Open Source Project
edd86fdaa9 auto import from //depot/cupcake/@136594 2009-03-05 14:34:30 -08: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
The Android Open Source Project
d2f2b1d7b7 auto import from //depot/cupcake/@132589 2009-03-03 14:03:58 -08:00
The Android Open Source Project
b8747bc7b1 auto import from //depot/cupcake/@137055 2009-03-02 22:54:20 -08:00
The Android Open Source Project
74a996a2c7 auto import from //branches/cupcake/...@132569 2009-02-20 07:38:28 -08:00
The Android Open Source Project
ff4b5f241f auto import from //branches/cupcake/...@132276 2009-02-19 10:57:29 -08:00
The Android Open Source Project
87a88c4f03 auto import from //branches/cupcake/...@131421 2009-02-13 12:57:48 -08:00
Adrian Taylor
a1a69d0936 Improving comments in make_windows_sdk.sh.
This commit adds notes about some cygwin packages which I found were
required, and a few other things which cropped up. It has no functional
changes.

List of packages amended as per request by Raphael Moll
(ralf@android.com).
2009-02-13 10:08:31 +00:00
The Android Open Source Project
e3c5766074 auto import from //branches/cupcake/...@130745 2009-02-10 15:43:58 -08:00
The Android Open Source Project
2f3ec01460 Merge branch 'cupcake' 2009-01-22 00:15:57 -08:00
The Android Open Source Project
5a4d0fa291 auto import from //branches/cupcake/...@127436 2009-01-22 00:13:40 -08:00
The Android Open Source Project
2d6668aaf0 Merge branch 'cupcake' 2009-01-20 14:05:23 -08:00
The Android Open Source Project
7b53e39377 auto import from //branches/cupcake/...@127101 2009-01-20 14:03:55 -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
Xavier Ducrohet
712bebb0fa Update the Eclipse plugin README with new instructions on how to compile the plug-ins. 2008-12-05 14:57:51 -08:00
ralf
70af177cf3 Fix create_ddms_symlinks to create libs/ correctly.
Add git ignore files to avoid all build files from being submitted to git.
2008-12-05 12:36:27 -08:00
raphael
991c4bdd4d Fix eclipse setup scripts.
The fix will work for Linux and Mac, however for Windows the DDMS icons will have an invalid path.
I can address the Windows DDMS issue in a next CL if necessary by merging in a different
CL from upstream.
2008-12-03 21:13:12 -08:00