summaryrefslogtreecommitdiffstats
path: root/ide
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://android.git.kernel.org/platform/development ↵Steve Kondik2010-05-281-7/+0
|\ | | | | | | into eclair
| * Removed bad BuildPaths (not existing Directories after checkout)Christian Mehlmauer2010-05-181-5/+0
| | | | | | | | Change-Id: Ia21cb1927dfc8851f728ef3a2175cbdf701f7641
| * Removed Duplicate Build PathsChristian Mehlmauer2010-05-161-2/+0
| | | | | | | | Change-Id: I9b4d4d5163365cde3c97d0d8f05b38a4b8406cea
* | Merge branch 'master' of git://android.git.kernel.org/platform/development ↵Steve Kondik2010-05-111-26/+26
|\| | | | | | | | | | | | | into eclair Conflicts: build/sdk.atree
| * Adapt to new location of libcoreJean-Baptiste Queru2010-05-031-26/+26
| | | | | | | | Change-Id: I82b330562b4f0d2024e4fbe8235250abb029470c
* | fix .classpath to remove duplicatesKoushik Dutta2010-04-201-2/+0
|/
* merge from open-source masterJean-Baptiste Queru2009-11-081-1/+2
|\
| * Tweaks to sample .classpath to reduce errors.Chad Fawcett2009-10-071-1/+3
| | | | | | | | Removed the IM Provider, added some keystore/vpn paths.
| * Merge korg/donut into korg/masterJean-Baptiste Queru2009-07-251-0/+4
| |\ | | | | | | | | | | | | | | | | | | Conflicts: tools/eclipse/plugins/README.txt tools/sdkmanager/libs/sdklib/src/com/android/sdklib/avd/AvdManager.java
* | | Revise template to match spec per jham.Jeff Sharkey2009-10-011-1/+1
| | |
* | | Remove IM sources which no longer build.Andrew Stadler2009-08-241-4/+0
| | |
* | | Support AIDL files recently added to EmailAndrew Stadler2009-06-231-0/+1
| | |
* | | Cleanup eclipse classpathAndrew Stadler2009-06-191-2/+0
| | | | | | | | | | | | | | | It's possible that these entries were already stale, but the recent clean build step may have exposed them.
* | | Add keystore & vpn to eclipse classpath.Andrew Stadler2009-06-171-0/+3
| | |
* | | am 7978517b: Merge change 3747 into donutAndroid (Google) Code Review2009-06-101-0/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Merge commit '7978517bdd52060e7d1ad10fcc3f358ad17eefef' * commit '7978517bdd52060e7d1ad10fcc3f358ad17eefef': Add the Term terminal emulator to the default Eclipse project classpath.
| * | Add the Term terminal emulator to the default Eclipse project classpath.Jack Palevich2009-06-101-0/+1
| | |
* | | am 6a95ff23: Merge change 2388 into donutAndroid (Google) Code Review2009-05-261-0/+2
|\| | | | | | | | | | | | | | | | | | | | Merge commit '6a95ff237b00d6da0fecd4c0d3ecfa999a2107db' * commit '6a95ff237b00d6da0fecd4c0d3ecfa999a2107db': Update Eclipse classpath file to add the android.tts package (path to package + files generated from AIDL).
| * | Update Eclipse classpath file to add the android.tts package (path to ↵Jean-Michel Trivi2009-05-221-0/+2
| | | | | | | | | | | | package + files generated from AIDL).
* | | Update .classpath for current version of calculator's jar fileAndrew Stadler2009-05-211-1/+1
| | |
* | | am 70c31ea: Merge change 947 into donutAndroid (Google) Code Review2009-05-041-0/+1
|\| | | |/ |/| | | | | | | | | Merge commit '70c31eae8c5fa014bc01027c63325af1e7ebe44b' * commit '70c31eae8c5fa014bc01027c63325af1e7ebe44b': IDE: Add ConfigBuildFlags to Eclipse's .classpath
| * IDE: Add ConfigBuildFlags to Eclipse's .classpathDave Bort2009-05-041-0/+1
| | | | | | | | Signed-off-by: Dave Bort <dbort@android.com>
* | Merge commit 'remotes/korg/cupcake' into cupcake_to_masterJean-Baptiste Queru2009-03-181-1/+0
|\|
| * auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0344-0/+11252
| |
| * auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0344-11252/+0
| |
| * auto import from //branches/cupcake/...@130745The Android Open Source Project2009-02-101-1/+0
| |
* | Merge commit 'remotes/korg/cupcake'Jean-Baptiste Queru2008-12-193-64/+162
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-173-166/+227
| |
* | Updated .classpath to use with Eclipse IDE.Andy Stadler2008-10-211-103/+64
|/
* Initial ContributionThe Android Open Source Project2008-10-2144-0/+11192