aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager/app
Commit message (Collapse)AuthorAgeFilesLines
* SDK Manager: copy guava*.jar in android.batRaphael Moll2012-11-271-6/+7
| | | | Change-Id: Ifb1ff2f6e432828f6584f03666e141ed64c82a72
* Update compiler flags.Tor Norbye2012-10-261-2/+2
| | | | | | | | | | Turns off the ability to use @SuppressWarnings with optional errors is available, but off by default (see Eclipse issue 392875). This turns that off, makes missing enums in switch statements a warning, and synchronizes the settings file to all projects (except tests.) Change-Id: Iad7060523b6ee2cbbca97e0a6ffedb264b185222
* Add cmd line support to create ui automator projects.Xavier Ducrohet2012-09-272-3/+83
| | | | Change-Id: I34ffff7d7828c171444c40e48fc3dcf093391324
* Merge "Remove obsolete stuff."Xavier Ducrohet2012-09-062-72/+3
|\
| * Remove obsolete stuff.Xavier Ducrohet2012-08-312-72/+3
| | | | | | | | Change-Id: Ib3a4f7c0c479b4c8c7f2e27d47ba756969d4f0b4
* | Refactor SDK Manager into "core" vs "ui" packages.Raphael Moll2012-09-041-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is just a refactor to move classes around. No functionality is actually changed. The sdkman2 package contains classes that are now sorted between "ui" and "core" packages. The core stuff has no UI dependency and can be used in unit tests, whereas the ui stuff needs SWT somehow. In a later CL some of the UI stuff will be changed to make it easier to mock for testing. Change-Id: I86606df7992de6ca6ae1df95f7b712cbba4fd3b6
* | SDK Manager: fix support for file:// URLs in UrlOpener.Raphael Moll2012-08-311-0/+73
|/ | | | Change-Id: I5996187d0ccd002d9ec3fe8c0fa5d17a96671431
* Fix SdkManager.hasChangedRaphael Moll2012-08-281-0/+47
| | | | | | Also add a simple unit test. Change-Id: I8ed3dfbea07578528036f1dabd75c18f3161819c
* Fix nullability annotationsTor Norbye2012-08-211-3/+4
| | | | | | | | | | | Eclipse 3.8/4.2 requires that any method which overrides another method with a @NonNull parameter (see https://bugs.eclipse.org/bugs/show_bug.cgi?id=381443). This changeset adds @NonNull on various overriding methods in newly added code such that Eclispe 4.2 doesn't show errors. Change-Id: Ice4a4b4dc31ba68c4e0911bb37c15da090076a0d
* Make sure android.bat copies all the jars it needs.Xavier Ducrohet2012-08-171-0/+1
| | | | | | Bug: 6995718 Change-Id: I88b96a84c7e04051808fce7b54adb4160b927af1
* Unify all loggers in the sdk tools.Xavier Ducrohet2012-08-173-78/+83
| | | | | | | | | | Removed ILogger from ide_common Removed ISdkLog (and implementations) from sdklib Moved all existing code to com.android.utils.ILogger which is located in common. Change-Id: Icd674d4b8d10f6ae8b60a83acb43cc53c7a52137
* More refactoring.Xavier Ducrohet2012-08-137-8/+6
| | | | | | | Move stuff out of sdklib into common and ide_common. Remove androidprefs and move the one class into common. Change-Id: I71d126a13cf2ba413692e29616f4968a37d7b33a
* Refactor common.jarXavier Ducrohet2012-08-072-2/+2
| | | | | | | | | | | | | | | Move resources and com.android.util.Pair into layoutlib_api where they belong since layoutlib depends on them and we need to control the API. Made a copy of Pair to stay in common.jar but moved it to com.android.utils.Pair (the one in com.android.util.Pair is marked as deprecated to prevent usage where applicable). Also moved XmlUtil and PositionXmlParser to com.android.utils to match Pair. Change-Id: I21d7057d3f2ce604f86a3bb1fa3c130948c93b89
* Fixed AvdManager to only have one instance per SDK locationMichael Wright2012-07-231-5/+5
| | | | Change-Id: I59697ef605e33a9216ed318190060e71ce0df579
* Added dvlib to jars copied in android.batMichael Wright2012-07-031-0/+1
| | | | Change-Id: Id13886368d8aecbf9bdccffd4dd89ec7a05888f5
* SDK Manager: new --clear-cache flag for command-line.Raphael Moll2012-06-202-0/+22
| | | | Change-Id: I2153a3f451567708ac25f992cdeaa0fb5f1adef3
* Fix warningsTor Norbye2012-06-011-0/+5
| | | | | | | | | | | | | | | | | First, update our various project-specific Eclipse compiler settings configuration files to include the new Eclipse 4 flags. Second, turn off the "Unchecked conversion from non-annotated type to @NonNull" warnings; there are hundreds or thousands of these, and there isn't much we can do about them when they're coming from platform and library APIs. Third, make the lint projects warning-clean again by addressing various warnings Eclipse found (such as some unclosed resources and some null handling issues; yesterday's null annotation fixes only addressed errors, not warnings.) Change-Id: If75f7401a1cbeef1bf58b47ccaa9ad17bede7f91
* SDK: Fix prebuilts/tool reference in wrapper scripts.Raphael Moll2012-05-081-1/+1
| | | | Change-Id: I928ce1288886f54d21868c20da56dbd4fe872770
* Reorganize sdklib.repository packages.Raphael Moll2012-04-211-2/+2
| | | | | | | | | | | This splits the sdklib repository in 3 sub-packages for archives, packages and sources. There are a lot of files moved around but its just a move refactoring and the only thing changes are imports and a few methods made public. Change-Id: I6ce0e872ac7afea2a6a4eb70ee7bbad0c04b6678
* SDK: Fix classpath for eclipse projects.Raphael Moll2012-04-121-11/+10
| | | | | | | | | | 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
* Switch libraries from Eclipse 3.4 to Eclipse 3.6.2Tor Norbye2012-04-053-7/+7
| | | | | | This reverts commit f3d3fa912a10e20cadae813b80a66e538f77131d. Change-Id: I72e28e21db3c7f959040c1fbb9df14e4d85d0df4
* Update classpath for eclipse project due to prebuilt move.Xavier Ducrohet2012-04-051-1/+4
| | | | | | | Don't use User Libraries. It's easier to just hardcode them with a classpath variable. Change-Id: If8c1236199dd6766d48cf9b553fa2a9ee0d236e6
* Revert "Switch libraries from Eclipse 3.4 to Eclipse 3.6.2"Tor Norbye2012-04-032-4/+4
| | | | This reverts commit b0c819f896b3c579633849e3fa674a30e6978dd7.
* Switch libraries from Eclipse 3.4 to Eclipse 3.6.2Tor Norbye2012-04-022-4/+4
| | | | | | | | | | | This updates the org.eclipse.core.command, org.eclipse.jface and org.eclipse.equinox libraries from Eclipse 3.4 to Eclipse 3.6.2. It also updates SWT from 3.4 to 3.6.2 (and this drops the Carbon support from the SwtMenuBar library since SWT 3.5 switched to Cocoa by default.) Change-Id: I7e8a6e3b8cb473f90eca3b90e3f3dc5fa5099b71
* SDK Manager: remove obsolete "pages" mechanism.Raphael Moll2012-03-274-344/+0
| | | | | | | | | | | | | | The SdkManager v1 UI was based on the principle of a settings-like page selector with various pages. For ease of transition, the v2 UI retained this to implement the settings and about pages yet was simply wrapping them into an swt dialog. This cleans up the code by removing the obsolete page registration thing and instead replaces the pages by 2 simple dialogs. Change-Id: I7f4f3941b5ccfd6ee636c84ebd5f06c237128a84
* SDK Manager: remove "update sdk" action.Raphael2012-03-261-8/+4
| | | | | | | | | | | In v1, using the SDK Launcher.exe would issue "android update sdk" which would pop a window ready to install. The launcher was fixed in the sdkman v2 but the command-line flag was still supported. Remove it since it just doesn't work the same way in the new UI. Solves SDK issue 23294. Change-Id: If3a30685f9a3f06888e386a918e9fd59c691c58b
* Move CommandLineProcessor from sdkmanager to sdklib as CommandLineParserRaphael2012-01-053-1084/+2
| | | | Change-Id: I4413efea2887436d167ce44db6f0cd711bdf8fdd
* Add @NonNull annotation and configure Eclipse settingsTor Norbye2011-12-221-1/+13
| | | | | | | | | | | | | | This changeset adds a new @NonNull annotation, to match our existing @Nullable annotation, and it adds configuration settings for Eclipse 3.8 / Eclipse 4.2 which configures the new null analysis there to use our own annotations. Note that the annotations only have source retention so there is no extra size or class-loading overhead. (To use findbugs you'll need to temporarily change retention to class-level.) In upcoming CL's I'll use these annotations to clarify the Lint API and other APIs. Change-Id: I99096d8b8a7e25ef002624d592da7700195a5872
* Update SDK codebase to JDK 6Tor Norbye2011-12-213-4/+22
| | | | | | | | | | | | | | | | | | | | | This changeset makes the SDK codebase compile with source=1.6 (which means it also requires JDK 6). This means that methods implementing an interface requires @Override's. It also means we can start using APIs like the ArrayDeque class and methods like String#isEmpty(). This changeset looks big but the change is trivial: it's basically adding @Override in all the places that need it, along with some other automatic Eclipse cleanup in certain files (such as reordering imports where they were incorrectly ordered (because older versions of Eclipse didn't always handle inner classes right)), as well as cleaning up trailing whitespace and removing some $NON-NLS-1$ markers on lines where there aren't any string literals anymore. This changeset also sets the source and target JDK level to 6 in the Eclipse compiler .settings file, and synchronizes this file to all the other Eclipse SDK projects. Change-Id: I6a9585aa44c3dee9a5c00739ab22fbdbcb9f8275
* SDK Manager: list/update sdk --allRaphael2011-12-162-19/+60
| | | | | | | | | | This renames the list/update sdk --obsolete flag to --all (-a shortcut) to better reflect what the code actually does. SDK Bug: 23004 Change-Id: Ide60f3de97767283e7574a92d4ec96b0e5d4fd86
* SDK Manager Windows: detach from java process.Raphael2011-11-111-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes 2 issues: - A bug in android.bat was that the bat+lib were only copied if the arguments were 'update sdk'. However since Tools R14 the sdkmanager doesn't use these arguments anymore. - Consequently when invoked as 'android sdk' it was not copying itself in the temp folder and thus was locking the tools folder, preventing updates. - The new behavior is to always copy, like that we don't care how the app is launched. - The SDK Manager.exe was launching android.bat and then waiting for it to finish, capturing its stdout in care there's an error to display. That locks SDK Manager.exe and thus prevent from updating it too. So instead we just don't wait for the bat to finish, don't capture/display its stdout. If there's an error, the user can still use the command line version to find out what's wrong. SDK Bugs: 21212:SDK Setup.exe [keeps] an open file handle SDK Bugs: 11989:SDK Manager.exe should be able to detach (it doesn't do the part where the sdk manager could restart itself after an update though. I'll file a different issue.) Change-Id: Id473ce58d3f36d417b6c0ee5f07a039adbbe06c0
* android create id: prompt for passwdRaphael2011-11-012-33/+80
| | | | Change-Id: Id030c98501fd0b971a7377da95b452370dc7e1e7
* Code cleanup: make sure FileInputStreams are closed.Raphael2011-10-131-1/+13
| | | | | | | | | | | | | | | | Various places of the code construct a new FileInputStream on the fly and give it to another method. One many occasions the stream is never properly closed, which can lock files on Windows. 2 specific cases: - Properties.load() doesn't seem to close its input (when looking at the source bundled with the JRE). - The doc of InputSource (used by various XML parsers like the pull parser) indicates the caller should in general not close the stream and the parser itself should do it. Change-Id: I622b54a22f97ed2c9c8fdc56ccde331207d9d212
* Merge "SDK: fix typo in android.bat" into tools_r14Raphael Moll2011-10-041-2/+2
|\
| * SDK: fix typo in android.batRaphael Moll2011-10-041-2/+2
| | | | | | | | | | | | This prevents httpcore from being copied correctly. Change-Id: I28d6b4020e854cbe914fd418e51e6a53e7c5444f
* | SDK: revert c649a334 and fix missing \n properly. Do not merge.Raphael2011-10-042-8/+59
|/ | | | | | (cherry picked from commit b4ea99769f2bc149ac3a3fef77c49b7b4b83fe90) Change-Id: Ifee9c7706f29f8ab2968c9277bdd293182df0900
* SDK: fix missing \n in 'android create avd'. Do not merge.Raphael2011-09-301-0/+3
| | | | | | | | SDK Bug: 20430 (cherry picked from commit c649a334d7bc656ea3c00cd9d3d102c88fbf8f80) Change-Id: I8b4370b0d4ec4b96e9b65c214a9e06506b615a41
* Cherrypick 0a6192 from master. do not merge.Xavier Ducrohet2011-09-282-26/+68
| | | | | | Add support to make identity files from the command line. Change-Id: Ieb11a6ac46790f244786a20ede930768946abc91
* SDK repository: support for source packages. Do not merge.Raphael2011-09-271-1/+2
| | | | | | (cherry picked from commit d963b52229e2d1a3875698e5d2822f00df3485c9) Change-Id: I249fafe24795b94294c9f9251713c1028a3d9199
* Merge b927e75 from master. do not merge.Xavier Ducrohet2011-09-231-14/+14
| | | | | | | | | | | | When creating AVDs, check ABI before prompting for hw config. The check verifies the number of available ABIs and the presence of the --abi option (required if 2+ ABIs). This avoid going through all the hardware config to then get an error because --abi is missing. Change-Id: I1c69dec3f2262e5faa8ce8a2d53d01fcafe8a20d
* SDK Manager: Extract all source.properties constants.Raphael2011-09-181-3/+3
| | | | | | | | | | The SDK Manager uses specific constants to save local source.properties files in installed packages. This moves all these constants in a common constant class and makes it explicit that these constants form some kind of API that can't be changed arbitrarily. Change-Id: I005f13f53768fbcc677edf94be0b4c13e19e3ec8
* SDK Manager: make 'list sdk' ids deterministic.Raphael2011-09-164-129/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | This changes 'android list sdk' to output deterministic install IDs. These IDs can then be give to 'android update sdk'. Example of usage: $ android list sdk --extended Refresh Sources: [...] ---------- id: 2 or "android-13" Type: Platform Desc: Android SDK Platform 3.2, revision 1 [...] ---------- id: 41 or "extra-google-usb_driver" Type: Extra Desc: USB Driver for Windows, revision 4 $ android update sdk --no-ui --filter android-13,extra-google-usb_driver => This installs the platform API 13 and the USB Driver. SDK Bug: 19504 Change-Id: I3109c90371d292df4e9cf845208bf8efe774233f
* Load standalone system images in the SdkManager.Raphael2011-09-082-9/+14
| | | | | | | | | | | | | | | | | | This revamps the way system images are handled in the internal SdkManager class. Before, a given IAndroidTarget could provide a list of ABI strings it new about, discovered by parsing the SDK/platform/images/xyz or SDK/addon/images/xyz folder. This introduces the notion of System Image to an IAndroidTarget. A system image combines an ABI with a location strategy (legacy images folder, images sub-folder or standalone sdk/system-images folder) and an actual location path. Change-Id: If5b748aa9aef6788bc3c814818381c7918b40bca
* SdkManager: support <included-abi> in platform packages.Raphael Moll2011-09-061-0/+1
| | | | | | | | | | | This is part of a series of CL to add support for system-image packages separated from platform packages. In this small CL we just add the <included-abi> element to platform packages, load/save it and test by loading a sample XML. Change-Id: Icbf554ea398bbcfe5cf760f9d25aec3de088937a
* Findbugs cleanup in sdkmanager projectsMichael Zoech2011-08-292-3/+4
| | | | Change-Id: Ie9cd51cbec851667954b672a8dadd345aee7a71f
* SDK Manager: Fix log printf calls.Raphael Moll2011-08-261-2/+1
| | | | | | | | | | | | The SDK manager used to have log(String) calls which were replaced by log(printfFormat, printfArgs..) calls in R12. In a few places, we pass a string to the printf format that comes from some user variable or URL or another method and this string might contain % occurences that should not be taken as formatters. Change-Id: Ida29a18ba70d869a4f9d66f1d66edc010d9ec62d
* Rename default.prop/build.prop to project.prop/ant.propXavier Ducrohet2011-08-231-2/+2
| | | | | | | Opening projects in Eclipse will rename the file and "android update project" will do the same. Change-Id: I251881897c251eb07c9704eb9c2448cab47e5b83
* Remove unused export project feature.Xavier Ducrohet2011-08-232-67/+1
| | | | Change-Id: Ia40c3ff899c2641ab18c3aaad6edbc0856a0534e
* Modify android create/update project to deal with new build.xmlXavier Ducrohet2011-08-221-1/+1
| | | | | | | | | | | New mechanism to embed a build version into build.xml to figure out whether the build.xml file is obsolete or not. Use the version-tag: custom case to prevent erase user modifications. Fixed some issues with the name of the project (put in build.xml) for test projects which don't have any activity. Change-Id: Ib0333d15ca9558fffe24a718e704fcf4176c9014
* SDK: Expose Layoutlib Version through IAndroidTarget.Raphael Moll2011-08-183-182/+2
| | | | | | | | | This changes PlatformTarget to parse the Layoutlib Version (API + revision) stored by the SDK Manager in the source.properties of the platform on disk. Then this introduces an helper method in SdkManager to find the highest available layoutlib version. Change-Id: I94990dabed6c7e5ad3f8f06ff3b16696edca8653