aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update paths to use Eclipse 3.7.2.Siva Velusamy2012-04-191-3/+3
| | | | Change-Id: Ie01a2d1f71b1a2edfbdad717de3e7e252b9f4fe2
* Merge "JunitLaunch: Add option to run tests based on size."Siva Velusamy2012-04-196-3/+108
|\
| * JunitLaunch: Add option to run tests based on size.Siva Velusamy2012-04-186-3/+108
| | | | | | | | | | | | | | | | | | InstrumentationTestRunner allows running only tests annotated with @SmallTest, @MediumTest, or @LargeTest. This patch exposes this setting in the launch configuration dialog. Change-Id: Ica06b1731b4ec50854be40e3ee578bdfb12117eb Fixes: http://code.google.com/p/android/issues/detail?id=27569
* | Merge "Launch on same device regardless of AUTO/MANUAL mode."Siva Velusamy2012-04-191-14/+11
|\ \
| * | Launch on same device regardless of AUTO/MANUAL mode.Siva Velusamy2012-04-171-14/+11
| |/ | | | | | | | | | | | | | | | | | | The device chooser dialog has a checkbox that allows the user to say that the same device should be used for future launches. This setting was respected only if that launch mode was AUTOMATIC. This patch enables launching on the same device in MANUAL launch mode as well. Change-Id: I3bab9fd34a64c3891e03bf9adf285be11d4de017
* | Merge "Fix lib properties on windows."Xavier Ducrohet2012-04-184-23/+11
|\ \
| * | Fix lib properties on windows.Xavier Ducrohet2012-04-174-23/+11
| |/ | | | | | | | | | | | | This is a very crude first fix while we figure out how to properly escape/unescape all chars. Change-Id: I783f8fdfd802e1a8ff44bbc7f6056fb607a3e523
* | Merge "Fix 29094: Some XML file types open multiple editors"Tor Norbye2012-04-182-0/+23
|\ \
| * | Fix 29094: Some XML file types open multiple editorsTor Norbye2012-04-182-0/+23
| | | | | | | | | | | | Change-Id: I4981790afecbed04cce5bf434a859bec93e2b61b
* | | Merge "SDK: Open AVD Manager from from AVD Selector > Manager."Raphael Moll2012-04-184-21/+26
|\ \ \
| * | | SDK: Open AVD Manager from from AVD Selector > Manager.Raphael Moll2012-04-174-21/+26
|/ / / | | | | | | | | | | | | | | | SDK Bug: 29026 Change-Id: I036bcd7e23210ebf3991b56211c38c077ef3d308
* | | Merge "Move emulator GLES from development.git to sdk.git"Jesse Hall2012-04-17315-0/+56685
|\ \ \ | |_|/ |/| |
| * | Move emulator GLES from development.git to sdk.gitJesse Hall2012-04-16315-0/+56685
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The emulator GLES support has two interfaces: a host shared library interface used by QEMU, and a protocol between the platform and the host. The host library interface is not versioned; QEMU and the GLES renderer must match. The protocol on the other hand must be backwards compatible: a new GLES renderer must support an older platform image. Thus for branching purposes it makes more sense to put the GLES renderer in sdk.git, which is branched along with qemu.git for SDK releases. Platform images will be built against the protocol version in the platform branch of sdk.git. Change-Id: I2c3bce627ecfd0a4b3e688d1839fe10755a21e58
* | | Merge "fix create_all_symblinks with new location of http-client."Xavier Ducrohet2012-04-161-6/+6
|\ \ \
| * | | fix create_all_symblinks with new location of http-client.Xavier Ducrohet2012-04-161-6/+6
|/ / / | | | | | | | | | Change-Id: I0313091219aa80cd1c97b796c4444a875db5311d
* | | Merge "SDK: primitive implementation of download cache."Raphael Moll2012-04-1617-158/+841
|\ \ \
| * | | SDK: primitive implementation of download cache.Raphael Moll2012-04-1617-158/+841
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It supports: - A local binary cache + a few http headers are saved - If ETag is present, generates a GET with If-None-Match - If Last-Modified is present, generates a GET with If-Modified-Since - Ability to configure the cache to be direct (don't cache), or serve without checkout or serve with a server check. - Doesn't check cached files if newer than 10 minutes. - For servers with no ETag/LastModified support, check files every 4 hours (no pref to change this yet.) Change-Id: I515e77291fb6810453e82e73f6508cfc60b2f422
* | | Merge "SDK: Use HttpClient from prebuilts/tools"Raphael Moll2012-04-161-5/+5
|\ \ \
| * | | SDK: Use HttpClient from prebuilts/toolsRaphael Moll2012-04-161-5/+5
| |/ / | | | | | | | | | | | | | | | Requires prebuilts/tools.git change I24a2f1608 Change-Id: I7f128be1acfe585e22b5350ac1b598d4b01dc006
* | | Merge "SDK: change proguard.config for Windows."Raphael Moll2012-04-161-3/+4
|\ \ \ | |_|/ |/| |
| * | SDK: change proguard.config for Windows.Raphael Moll2012-04-161-3/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default to use / dir-separators even for the Windows template. The / will be correctly replaced by \\ by both Ant and our ExportHelper, ensuring a relative path works on all platforms. SDK bug: 28860 (This does not solve the path-separator issue with ; vs : on Windows. That will be addressed later.) Change-Id: Iee3ae9c58aa606aee7943c4e20643164bbf7344b
* | Merge "Fix botched refactoring"Tor Norbye2012-04-162-50/+52
|\ \
| * | Fix botched refactoringTor Norbye2012-04-162-50/+52
| | | | | | | | | | | | Change-Id: I02fcbfd6db7338c125a2e57ca39fc6e849d1a6b0
* | | Merge "Properly exclude some classes in code coverage."Xavier Ducrohet2012-04-162-1/+107
|\ \ \
| * | | Properly exclude some classes in code coverage.Xavier Ducrohet2012-04-162-1/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using a custom task to create the filter based on the app packages for the main project and its library projects and the list of class to exclude. Change-Id: Id37862bf53656bd17991b5c307d772ed2019650b
* | | | Merge "Fix "ant test" + misc clean up / reorganization of build.xml"Xavier Ducrohet2012-04-1648-1063/+2156
|\ \ \ \ | |/ / /
| * | | Fix "ant test" + misc clean up / reorganization of build.xmlXavier Ducrohet2012-04-1648-1063/+2156
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Split NewSetupTask in several tasks to make things more flexible. Particularly this allows more targets to get access to the project type (app, lib, test, ...) as it's not so computive intensive. - Fix test project to give them access to the full tested project's classpath. - Fix support for projects that test themselves. - Make sure library projects are instrumented when using the emma target. Change-Id: Ia0c9564eacee2521e7cbd5154b8a85ea287ad4fd
* | | Merge "Move tools to r20"Xavier Ducrohet2012-04-1624-37/+37
|\ \ \ | |_|/ |/| |
| * | Move tools to r20Xavier Ducrohet2012-04-1324-37/+37
|/ / | | | | | | Change-Id: I3877a7418da193cbe3759f25daafa3309bb8c05a
* | Merge "SDK: Fix classpath for eclipse projects."Raphael Moll2012-04-127-17/+19
|\ \
| * | SDK: Fix classpath for eclipse projects.Raphael Moll2012-04-127-17/+19
|/ / | | | | | | | | | | | | | | | | | | swt.jar must be found relative to the out/ dir (as generated by create_all_symlinks.sh) to avoid setting a platform-specific path. swtmenubar was missing the new libs references. Change-Id: I365cfa6e011ec831c4df87cb36b0df722caac2e4
* | Get rid of the file path whitelist.Omari Stephens2012-04-111-24/+0
| | | | | | | | | | | | | | | | The whitelist doesn't seem to serve any purpose currently, but does prevent legitimate attempts to access paths that aren't in the whitelist. Bug: 6325674 Change-Id: I0fbd44bb440a2b28010a9ca5c5ebd625130de628
* | Merge "SDK: Fix 2 toLowerCase using default locale."Raphael Moll2012-04-112-2/+4
|\ \
| * | SDK: Fix 2 toLowerCase using default locale.Raphael Moll2012-04-112-2/+4
| | | | | | | | | | | | Change-Id: I33fbad62b3df21068c64ef434d82682d4d192560
* | | Merge "SDK: adjust reported OS/JVM name/arch."Raphael Moll2012-04-113-28/+337
|\ \ \ | |/ /
| * | SDK: adjust reported OS/JVM name/arch.Raphael Moll2012-04-113-28/+337
|/ / | | | | | | | | | | Also add some UTs for testing. Change-Id: I55d4ad04feade4b4e8a81316511720731f9afdc9
* | Merge "SDK/Cygwin: add propertysheet to things we can build on windows"Raphael Moll2012-04-101-0/+1
|\ \
| * | SDK/Cygwin: add propertysheet to things we can build on windowsRaphael Moll2012-04-101-0/+1
| | | | | | | | | | | | Change-Id: I39bf14bd5c12e75d265ca5a21824b2a633939dbc
* | | Merge "SdkController: enforce java 1.6 compliance."Raphael Moll2012-04-101-0/+12
|\ \ \
| * | | SdkController: enforce java 1.6 compliance.Raphael Moll2012-04-101-0/+12
|/ / / | | | | | | | | | | | | | | | | | | This is to prevent it from defaulting to 1.5 and then @override cause lots of warnings. Change-Id: Iec8a1b459e9d50523b5ef82433bfab23366338f7
* | | Merge "Lint: Don't check match_parent versus fill_parent in api check"Tor Norbye2012-04-102-16/+0
|\ \ \
| * | | Lint: Don't check match_parent versus fill_parent in api checkTor Norbye2012-04-092-16/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those constants are tied to the build target, not the minimum or target SDK versions (so compilation will already complain if you're using a too old version.) Change-Id: I54376eb7c44f749e1494ff8a39987ec1aa6117ad
* | | | Merge "Add JDK 6 dependency for the ADT plugins"Tor Norbye2012-04-109-0/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add JDK 6 dependency for the ADT pluginsTor Norbye2012-04-099-0/+9
| |/ / | | | | | | | | | Change-Id: I8335bf7d72af4184d505826dc1024a3dde3b67b6
* | | am 7312c89a: Merge "Ensure screenshots saved through DDMS end with .png."Tor Norbye2012-04-061-0/+4
|\ \ \ | | | | | | | | | | | | | | | | * commit '7312c89ade9495d42132ec7fdf7db8142da5fa8a': Ensure screenshots saved through DDMS end with .png.
| * \ \ Merge "Ensure screenshots saved through DDMS end with .png."Tor Norbye2012-04-061-0/+4
| |\ \ \ | | |_|/ | |/| |
| | * | Ensure screenshots saved through DDMS end with .png.Sebastian Roth2012-04-061-0/+4
| |/ / | | | | | | | | | | | | | | | | | | This patch simply makes sure that the filename will have a .png extension when saving a screenshot through DDMS. Change-Id: Idb00259ac456fcaf11ee99736663fc7ddbbc505b Signed-off-by: Sebastian Roth <sebastian.roth@gmail.com>
* | | am ec90c458: Merge "SDK: wrap NPE in getAttributeNS when editing XML files."Raphael Moll2012-04-061-5/+22
|\ \ \ | |/ / | | | | | | | | | * commit 'ec90c4583e232c660d7441f6c775542da6896037': SDK: wrap NPE in getAttributeNS when editing XML files.
| * | Merge "SDK: wrap NPE in getAttributeNS when editing XML files."Raphael Moll2012-04-051-5/+22
| |\ \
| | * | SDK: wrap NPE in getAttributeNS when editing XML files.Raphael Moll2012-04-041-5/+22
| | | | | | | | | | | | | | | | | | | | | | | | SDK Bug: 28266 Change-Id: I239bd44ba2c3fdb0193511f765b649f85d741066
generated by cgit v1.1 at 2025-01-10 13:59:11 +0000