summaryrefslogtreecommitdiffstats
path: root/WebKitTools/android
Commit message (Collapse)AuthorAgeFilesLines
* Fix errors when compiled under g++ 4.4.1 on Ubuntu 9.10a4Jack Palevich2009-08-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | This environment ends up using the C++ version of strrchr rather than the C version. Apparently older environments use the C version of strrchr. I'm guessing the change is due to one of the standard C++ header files changing so that includes the new C++ version of strrchr. The difference is that the C version of strrchr is: char* strrchr(const char*, char); while the C++ version of strrchr is overloaded: const char* strrchr(const char*, char); char* strrchr(char*, char); This code depended on the C version to convert a const char* pointer into a non-const char* pointer. The fix is to change the code to work with a const char* result, and if that is not possible, manually insert a hard cast of the return value.
* WebKitMerge tool fixes.Ben Murdoch2009-08-111-2/+2
|
* Makefile and webkitmerge tool edits needed to merge with latest webkit.Ben Murdoch2009-08-111-28/+29
|
* Make this host tool compile with GCC 4.4Jack Palevich2009-06-251-0/+1
| | | | | | | | It has a dependency on cstdio (aka stdio.h), but was not explicitly including it. In previous versions of GCC the cstdio file was implictly included as a side-effect of including another library. This change is backwards compatible with earlier versions of GCC.
* update webkitmerge with git-specific commandsCary Clark2009-04-151-49/+118
|
* AI 146111: update webkitmerge to handle git, svg, fix bugsCary Clark2009-04-141-75/+212
| | | | | | | | | | | | | | | | //branches/master/android/external/webkit/WebCore/Android.derived.mk add exclusion rules for svg //branches/master/android/external/webkit/WebCore/Android.mk add exclusion exceptions (e.g., files from /skia/ that we use) remove the need to have '\' at the end of each file //branches/master/android/external/webkit/WebKitTools/android/webkitmerge/webkitmerge.cpp don't delete modified files, but mark them with MANUAL_MERGE_REQUIRED add --execute option (in progress) add --perforce, --git options fix double add of file when it appears in sandbox and new webkit BUG=1553405 Automated import of CL 146111
* AI 144627: webkitmerge is a command line tool that merges newer version of ↵Cary Clark2009-04-063-0/+1856
| | | | | | | | | webkit to Android. It can be either run from XCode using the xcodeproj or from the command line. BUG=1553405 Automated import of CL 144627
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0387-0/+44976
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0387-44976/+0
|
* Initial ContributionThe Android Open Source Project2008-10-2187-0/+44976