aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager/app
Commit message (Collapse)AuthorAgeFilesLines
* Merge 74f725db from master: Add snapshot handling for AVD creation, details, ↵Tim Baverstock2011-01-128-62/+451
| | | | | | | | and launch Also respect 'Wipe User Data' by disabling snapshot launch, and support 'Edit AVD'. Change-Id: I2fee9361d78d70b80314523e36b48fbd80b03ca7
* SDK Manager: specify proxy on no-UI command-line.Raphael Moll2011-01-063-10/+67
| | | | | | | | | | | | This adds 2 flags to specify the http/https proxy host/port on the command line when using the console-base "no-ui" SDK update. The command-line proxy values override settings if defined. Also revamped the argument help display to support larger command-line long argument sizes and mandate that arguments can have one of ther short or long argument name optional. Change-Id: I87cc535ab369602a5c02c7a938b0e4f4736c0040
* Fix android.bat to properly cd to temp dir.Raphael Moll2010-12-281-1/+1
| | | | | | | | Fixes an issue when the SDK is not on the same drive than the temp dir that android.bat uses. Reported on http://code.google.com/p/android/issues/detail?id=4410 Change-Id: I993ea550056bda2c696c28bfa135aa186aad7a05
* Remove AdtPlugin dependency from AttrsXmlParser.Raphael Moll2010-11-173-52/+6
| | | | | | | | | | | | The AdtPluin was used just for logging. Instead the AttrsXmlParser takes an ILogger (AdtPlug implements ILogger and can be used directly in unit tests too). For unit tests there is a new StdSdkLog convenience class that prints to stdout/stderr (formerly MockStdLogger from the Sdk Manager was doing that.) Change-Id: I658af61d04efb19ad6e3bf9c0bf471452372885a
* SDK Manager: addon schema version number in about box.Raphael Moll2010-10-191-1/+4
| | | | Change-Id: I2a54180f46e52cba931154ae57826c6df22b6a07
* SDK Manager: remove userCanChangeSdkRoot flag.Raphael Moll2010-10-091-2/+1
| | | | | | | | We've never enabled the UI for it as the SDK path is dicated by where the manager is started from, so it's time to clean it up. Change-Id: I97d7ede19e869b970e649ea8a6f9b94045a71269
* SDK Manager: support separate addon.xml schemaRaphael Moll2010-10-063-7/+7
| | | | | | | | | | | | This splits sdk-repository-3.xsd into 2 XML schemas, one for the sdk-repository and one for the sdk-addon. The SDK Manager is then modified to only load <addon> and <extra> from the sdk-addon whils the <sdk-repository> supports everything (including <addon> if the old v1 or v2 schemas are being used). Change-Id: I30b263f2ab48dd3ea7b70d3006fb6516291736d0
* Doc Change: Updated usage doc for android toolJoe Malin2010-08-301-13/+14
| | | | Change-Id: I7aefc6551d07005050991c29e6f1d06a33747dc5
* Doc Change: Updated usage help for Android toolJoe Malin2010-08-301-34/+34
| | | | Change-Id: Ie23d54738ba5f20da57431b81aadcc4f21ca85b0
* Android.bat support for Java 64-bit.Raphael Moll2010-08-211-81/+81
| | | | | | | android.bat: properly encode file using CRLF (not Unix mode). find_java.bat: properly check for Java in the 64-bit ProgramFiles path. Change-Id: I78adb4783955cfad867d29f66d7ee58a017d41c4
* SdkManager: support for upgrade to Schema #3.Raphael Moll2010-07-301-2/+7
| | | | | | | | | | | | | | | | This changes the way the sdk manager looks for schema upgrades: - when trying to load an XML, parse the root element and scan for our XLMNS. If it parses, get the version number at the end and use this directly to try to load using the right schema. - In turn this allows us to distinguish between an incorrectly formatted XML (but using the right schema) versus something that is not our XML schema or not an XML at all, and then we can produce better errors for the user. - We also then directly know when the schema version is above the known value of the tool and can then create the upgrade tools node accordingly. Change-Id: I58c7d89d7b57dd4d5488f726e5f8b21cc4308451
* Update sdklib to use the new sdk organization (build tools moved)Xavier Ducrohet2010-07-301-3/+3
| | | | | | | | Also do some minor clean-up from the recent change to ProjectProperties. FileWrapper extends java.io.File so there's no need to create a File and then create a FileWrapper around it. Directly create a FileWrapper. Change-Id: I3f072bf7f848d63b90fa03bec2683f6a009deb88
* SdkManager: don't use deprecated methods.Raphael Moll2010-07-291-2/+4
| | | | | | | | | If we're going to deprecate the parsePropertyFile(File), we might as well stop using it ourselves. Also removes the obsolete parsePropertyFile(File) method. Change-Id: I811590ca583f2a89d5b7d606d70a4bc14eb6230b
* Merge "Update ddms (all) and 'android' (linux/mac) to user explicit classpath"Xavier Ducrohet2010-07-281-5/+2
|\
| * Update ddms (all) and 'android' (linux/mac) to user explicit classpathXavier Ducrohet2010-07-261-5/+2
| | | | | | | | | | | | | | | | | | | | They were still using the old method of providing a jar folder through java.ext.dirs in which to look for jar files. The jar dependency is now explicit in the manifest, which allows us to target ddmlib explicitely and not ddmlib-prebuilt. Change-Id: Ic3c5708ab327a3e1fb7a7cd86fffda96e0d988dd
* | Fix missing goto label in android.batXavier Ducrohet2010-07-271-0/+1
|/ | | | Change-Id: I1da6089cabe4a00567f2b7d1a7e5d2847f5799d4
* Disable unsupported feature for now.Xavier Ducrohet2010-07-021-4/+9
| | | | Change-Id: I2f2af2a0ba6087b99a7d0b9ed3acea62a48991f4
* Move Apkbuilder into sdklib.Xavier Ducrohet2010-06-161-3/+0
| | | | Change-Id: I88f7e6101b8c03157a320a6c9d9b7424ffbdc7f5
* Saving ProjectProperties now keeps existing file and replaces values.Xavier Ducrohet2010-06-141-1/+1
| | | | Change-Id: I15663980f931e0d15998f0430ee7154446036fca
* Export project creation.Xavier Ducrohet2010-06-083-31/+121
| | | | Change-Id: I22b5a1c7225425b387e1fd5b6769b5e9249b7c88
* Stop using java.ext.dirs to modify classpath for android.batXavier Ducrohet2010-06-073-7/+6
| | | | | | | | | | | | If the original value of java.ext.dirs contains space, then the value is lost and we lose access to optional crypto packages. The new mechanism uses a mix of -classpath (for main package and swt whose path is computed automatically). For other dependencies, we use the Class-Path attribute in the manifest of sdkmanager.jar. Change-Id: I06c46eb1abcd9b5bab6360d1430c0dcbc97f73ce
* Fix error detection for invalid command line arguments.Raphael Moll2010-05-191-2/+22
| | | | | | | | | | | | | | | This fixes 2 edge cases: - when an unknown extra parameter is given (it was simply ignored before) e.g.: "android update sdk foo" => foo is extra. - when a 1-argument parameter is used and no argument is actually given but instead the next dash-parameter is found. e.g.: "android update sdk --filter (missing value) --somearg" Change-Id: Idc34f61728411aceaf1cf33f070ac275b3798019
* Console-based "android update sdk"Raphael Moll2010-05-182-1/+124
| | | | | | | | | | | | | | | | | | | | | Known limitations: - This simulate exactly what the "update sdk" GUI does, namely it suggests the latest platform to install and updates older packages. - It respects the default source URLs (e.g. the getenv stuff) - there are a few options to configure behavior such as selecting obsolete packages and a dry-mode. - As such, this is mostly a one-shot update step and probably lacks configuration that a script-based updater would want. Non-goals: - No way to specifically request a given package to be installed. - No way to configure the output (e.g. the install progress might be annoying if the output is piped for a script) SDK Bug 2404640 Change-Id: If0512558f048e88f2b216e34ed33aa550ff2610c
* Disable --library for 'update lib-project'Xavier Ducrohet2010-05-132-6/+2
| | | | Change-Id: I44f612595750ff0b0248f0206456dcf2f53bcf47
* SDK Setup fixes.Raphael Moll2010-04-282-9/+5
| | | | | | | | | | | - SDK Setup: cd to the SDK dir, to cope with the case where the setup is executed from a shortcut with a different base directory. - SDK Manager: properly detect "update sdk" and "update avds" commands. Change-Id: I1f0d32fffd71d3fa0856e753a80505f3dcd076d1
* Shorten the default help from the "android" script.Raphael Moll2010-04-271-37/+42
| | | | | | | | | | | | | | | | | Changes: - Default is to print the global options and the list of verbs/objects but not their detailed options. - Using "android --help create" shows all possible "create xyz" options. - Using "android --help create project" shows only the options for this particular command. - As usual an incomplete command will prints its specific options as help. SDK Bug 2436537 Change-Id: Icb95504ac9a048e5870fad396f3c4382ca5a1f8f
* SDK Manager: fix crash when creating new AVD with no home.Raphael2010-03-251-2/+13
| | | | | | | | | | This also fixes the logging: - properly propagate the ISdkLog to the AvdCreateDialog. - properly use the ADT console for logging when invoked from Eclipse. SDK Bug 2535112 Change-Id: I9e059fe30fe02c4f5d3e70054b4454f5703df515
* Check whether the project's target supports libraries.Xavier Ducrohet2010-02-161-4/+4
| | | | | | | | Check is done when: - a library is added to a project through "android update project" - a project is compiled through Ant Change-Id: I09993b9aac5ad32a84335647429fc52fa2babaf9
* Add support for creating/updating library project to the "android" ↵Xavier Ducrohet2010-02-112-54/+122
| | | | | | | | | command-line tool. Also, support to add a reference to a library from a regular project. Bug: 2294012 Change-Id: I5323dd5816426651a1e77ab206d9d17ee5749813
* SDK Manager: apply settings instantaneously.Raphael2010-02-011-40/+14
| | | | | | SDK Bug: 2411665 Change-Id: I6d4a38f4f2d974a727d8e0891d63618d82c578ad
* Merge "Fix 'android create test-project' to handle parent projects with ↵Xavier Ducrohet2010-02-011-1/+7
|\ | | | | | | missing default.prop" into eclair
| * Fix 'android create test-project' to handle parent projects with missing ↵Xavier Ducrohet2010-02-011-1/+7
| | | | | | | | | | | | | | default.prop Bug: 2411562 Change-Id: Ia22491d56dfa3c5dda700782c28a2bcbfeebd266
* | SDK Manager: fix android.bat to correctly work on 64bit JVMs.Raphael2010-02-011-5/+5
|/ | | | | | SDK Bug: http://b.android.com/3917 Change-Id: I4a72a3c16ddeb9ab331342de7a72cc5ae61e8cdc
* Fix https download for the standalone version of the SDK UpdaterXavier Ducrohet2010-01-292-4/+8
| | | | | | | | | | | | | | | | The problem was due to the launch script completely replacing java.ext.dirs preventing the VM from accessing the optional jce.jar package (Java Cryptography Extension). The launch script now queries the JVM for the current value of java.ext.dirs (using archquery) to append to it instead of replacing it. In order to do that, archquery.jar now outputs only the value of the queried system property instead of output "name=value" Bug: 2248892 Change-Id: If17d48e46529bebc1a25daf99f2748e9ec81a214
* SDK Updater: Support post install script for updating SDK Setup.exe.Raphael2010-01-281-1/+1
| | | | | | | | | The new post_tools_install.bat will be found in SDK/tools/lib. This also moves find_java.bat into the same lib folder. SDK Bug: 2404830 Change-Id: I84e3671918931079f296500e296ec1a55931b851
* SDK Launcher: capture stdout from batch file.Raphael2010-01-271-3/+3
| | | | Change-Id: Iab4e8f54bf2039cd9a17b1e814ffdc3ccd3deb23
* Windows SDK: use find_java.bat in all batch wrappers.Raphael2010-01-261-57/+4
| | | | | | SDK Bug: 2315813 Change-Id: If026d09f927b3d0b5707dfd08e1367e4ba2da28b
* android.bat now checks if Java is installed.Raphael2010-01-261-14/+81
| | | | | | | | | | When not in the path, search for it in the program files where java installs by default. If not found, let the user know where to download it. SDK Bug: 2315813 Change-Id: I4b077606d86969f989279a5eaeebb2f1895a6ef2
* Make "android update test-project" create all necessary files.Xavier Ducrohet2010-01-201-1/+2
| | | | | | | | | | | Previous implementation only created build.properties to set the location of the main project. This new version will also update/create files as the main "android update project" command does. Bug: 2284744 Change-Id: I8938d0a49537c5d4fbc60d3557a21ab7c40fad3e
* Add support for Sample packages in the SDK ManagerXavier Ducrohet2010-01-121-4/+6
| | | | | Bug: 2296352 Change-Id: Id26fdb02030d00a27960b3e0a21d3c537e7cf8da
* SDK: Enforce GDK_NATIVE_WINDOWS=true for linux scriptsRaphael2009-11-021-0/+4
| | | | | | SDK BUG 2232091 Change-Id: I2a000054545b7865769054d1fdc733e50f06edd5
* Fix the android launcher script to not force Java 1.5 on MacOSXavier Ducrohet2009-10-291-4/+3
|
* Merge change I235da4a8 into eclair-sdkAndroid (Google) Code Review2009-10-211-11/+15
|\ | | | | | | | | * changes: SDK android "update project" must not require --target parameter.
| * SDK android "update project" must not require --target parameter.Raphael2009-10-211-11/+15
| | | | | | | | | | | | SDK BUG 2203846 Change-Id: I235da4a8892de9a4334d5630667484220472f168
* | Android.bat: remove /O in xcopy.Raphael2009-10-201-1/+1
|/ | | | | | | | It means "copy ownership". But on the Vista 64 box in the lab, it make the xcopy of lib/x86/swt.jar fail the next time when it was already present. SDK BUG 2198636
* Merge change Ib096f1f0 into eclairAndroid (Google) Code Review2009-10-133-3/+61
|\ | | | | | | | | * changes: SDK Manager: suggest install of new platforms, addons or extra packages.
| * SDK Manager: suggest install of new platforms, addons or extra packages.Raphael2009-10-123-3/+61
| | | | | | | | | | | | Supports the new "android update sdk" action. Change-Id: Ib096f1f024639018252c58d4f9c8872ead3c39b9
* | SDK: Support "android.bat update sdk"Raphael2009-10-121-0/+2
|/ | | | | | | | | This ammends the batch file to recognize "android update sdk" to start the updater UI. SDK BUG 2173128 2173150 Change-Id: I3a2b9df9a3c52aa86bf34d05389c4034d60d57dc
* Add hardware support to AVD creation dialog.Xavier Ducrohet2009-10-071-5/+7
| | | | Change-Id: Ia20b55c788191b40159b5c38b66f1da333179ccc
* Add support for 'android update test-project'.Xavier Ducrohet2009-09-282-5/+29
| | | | | | | This is only to be used to update the location of the main project. To update other properties, 'update project' can be used. Change-Id: I96ff44295460c7e331953263abccea17108d5a70