aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge "ADT: Suggest solution to ADT version check error."Raphael2012-02-225-7/+44
|\
| * ADT: Suggest solution to ADT version check error.Raphael2012-02-225-7/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | This amends the ADT version check to help the user either: - open the SDK Manager - open the P2 Updater - open the Android Preference On Windows the launch the *external* SDK Manager since eventually we know that ADT will lock something that would prevent the update from working in the first place. Change-Id: Ib20e4e1411b36e3cd794cccbc02518db0a40ced9
* | Split ProGuard file into two halvesTor Norbye2012-02-213-10/+25
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset splits the proguard.cfg into two halves: (1) All the general Android settings go into $ANDROID_SDK/proguard/proguard-android.txt. This defines shrinking rules like keep custom views, etc. The crucial point is that this information is maintained and updated by Tools updates, so whenever new APIs are added to Android, or whenever bugs are found in the configuration such as flags needed to work with Dalvik, we can make the updates - we don't have old snapshots living on in projects. (2) Any project specific settings go to proguard-project.txt in the project. (3) The proguard.config property in project.properties now refers to a *path* of configuration files, which are all passed to ProGuard in the given order. The code which processes this setting will substitute android.sdk.home and user.home variables, so the path does not have to be hardcoded to point to the project-android.txt file. The default project templates have been updated to include a commented out configuration setting up proguard as described above. The default proguard file name was changed from proguard.cfg to proguard-project.txt such that it can be directly opened in Eclipse and to make it clear it's an editable text file. Lint was updated to find the Proguard file via the proguard.config property as well as via the old and new default names for projects not enabled with ProGuard. A subsequent CL will add a lint check which identifies projects containing the old setup (full local configuration) and offer to replace it with the new setup. Change-Id: I44b4c97a160114c2382f02f843c95486a0dc9d6b
* Fix build: generate addon.xml in v3, not new v4 xsdRaphael2012-02-171-0/+0
| | | | Change-Id: I7a416dfacfa871755ce86660feb73b699ff97dc1
* SDK Repository: name/vendor id/display for addons.Raphael2012-02-1513-158/+340
| | | | | | | | SDK Bug: 21942, part 2 of 3. (part 3 is replacing manifest.ini by source.props) Change-Id: I96be0d8210120927744224d909f7ee7184ebfecf
* SDK Manager: support forward evolution of repository-N.xmlRaphael2012-02-152-15/+46
| | | | Change-Id: I1ec10f677d542b02d1588c43d5b40ed10d94f874
* SDK Repository: vendor id/display name for extras.Raphael2012-02-1522-243/+1273
| | | | | | SDK Bug: 21942, part 1 of 2. Change-Id: Id9c026965b365e57302c56620f4ec8f88573d633
* SDK Repository: remove <extra> from repository.xmlRaphael2012-02-156-5/+1039
| | | | | | | | | | | | | | To simplify and avoid XSD duplication, remove extra packages from the repository.xsd. Instead they should be defined via an addon.xml. Note that -repository-6.xsd is prefixed with a dash, meaning the SDK Manager 17 knows about it and can enforce it but the build server will continue creating repos in v5 for now. Once r17 is deployed, we can make the xsd v6 mandatory for r18. Change-Id: I00d4644378bcc95bfd9ceb7eede0c8c720926f74
* Merge "SDK Manager: use find_lock.exe when install dir is locked."Raphael2012-02-153-41/+172
|\
| * SDK Manager: use find_lock.exe when install dir is locked.Raphael2012-02-093-41/+172
| | | | | | | | | | | | | | | | | | | | For the SDK Manager on Windows, this uses find_lock.exe to try to find the processes that are locking an existing SDK folder that cannot be moved out of the way. The result is displayed in a simple yes/no dialog or on the command-line if invoked without UI. Change-Id: I39fa7529e207e870376a30c8311440f9c240d4b3
* | Merge "SDK/ADT: Refactor grabProcessOutput."Raphael2012-02-104-267/+201
|\ \ | |/
| * SDK/ADT: Refactor grabProcessOutput.Raphael2012-02-084-267/+201
| | | | | | | | | | | | | | | | | | We have many implementations of grabProcessOutput. This introduces an utility in sdklib that takes an interface to capture out/err and uses this in various places instead of duplicating the code. Change-Id: I7e6eea443c592ae5670485369233e1cd002ff9cc
* | SDK Manager: fix duplicate when installing new package.Raphael2012-02-094-7/+19
|/ | | | | | | | | | This is a simple refresh issue on the display table. The internal diff properly detects that an uninstalled package is being replaced by a freshly installed package however it wasn't updating the table view to remove the obsolete uninstalled entry. Change-Id: I6ecb7be55848046d9843df2333a09013a2a551c1
* SDK Manager: stop spamming eclipse log.Raphael2012-02-061-1/+1
| | | | | | SDK Bug: 24235 Change-Id: I5276381416a800cca3a1adf415d2f73dd52b2615
* Merge "SDK Manager: extract samples as read only."Raphael2012-02-061-0/+22
|\
| * SDK Manager: extract samples as read only.Raphael2012-02-061-0/+22
| | | | | | | | | | | | | | | | | | | | This changes the SDK Manager to extract sample code as read-only files (for java, aidl and xml sources). Then we have a change in ADT to make sure that the NPW copies the sources of a sample as read-write. Change-Id: I26a494d3b1a08890b5b6970eea759b6f7c63c62c
* | Merge "SDK Manager: extract source packages as r-o."Raphael2012-02-068-32/+117
|\ \ | |/
| * SDK Manager: extract source packages as r-o.Raphael2012-02-068-32/+117
| | | | | | | | | | | | | | | | Extract Java sources from source packages as read-only. When such sources are added to the target build path in Eclipse it prevents users from modifying them by mistake. Change-Id: I271d1d55e35ba275494b9d5d899817a7d0ad0361
* | Merge "Update default project icons, and add an xhdpi version"Tor Norbye2012-02-061-0/+2
|\ \ | |/ |/|
| * Update default project icons, and add an xhdpi versionTor Norbye2011-12-161-0/+2
| | | | | | | | Change-Id: I1c8a8ee2e470a30bc9df76b694e9b68fe09d5712
* | Automatically add annotations.jar on the classpath for API<=15Xavier Ducrohet2012-01-271-0/+5
| | | | | | | | | | | | | | This is to provide app some annotations used by the tools. Those annotations will be part of the API later. Change-Id: I32b31a3039e4fbb331682a84192252bd43c0f54a
* | SDK: fix build by removing obsolete makefile referenceRaphael Moll2012-01-251-1/+1
| | | | | | | | Change-Id: I026347f1b81643eecd685e60cb5a35428aaaba62
* | Windows: "find_java" exe and lib for android.batRaphael2012-01-2511-1548/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a "find_java.exe" that will be packages in SDK/tools/lib. It will be used by android.bat and the other launchers to locate the best version of java to use for our tools (currently we have a find_java.bat that uses DOS commands to achieve something similar but more limited). In addition this creates a static "findjavalib" that is used by the NSIS installer to locate java and get its version (to complain in case we only find a Java 1.4 or lesser). The goal is for the installer to use the same logic as the tools will use to locate the java binary. Change-Id: Ic2efb388135087bab9687c3332882047fd041b1c
* | SDK Windows: more ways to find java.Raphael2012-01-233-26/+370
| | | | | | | | | | | | | | | | | | | | | | | | | | Also properly redirect command-line output to the parent shell console. This is experimental. This CL removes "android.exe" from the Windows tools and only keeps android.bat. However in a next CL android.bat will be changed to use 'find_java' to locate the best Java exe around (this is currently done in a bat script) Change-Id: I6e5485fdf59fde9838cf929ff333e1c611ea7bb4
* | ADT: Fix "Add compatability library"Raphael2012-01-221-2/+12
| | | | | | | | | | | | | | | | | | | | | | 2 issues: - the code was still trying to look for the obsolete "compatibility" export <path> instead of the new "support". - the install filter did not support the <old-path> pkg attribute. SDK Issue: 21488 Change-Id: Ie083b008d9ecdb9467a1b203c7602b5cc8c0580d
* | Merge "Manifest Merger tool."Raphael2012-01-112-1/+8
|\ \
| * | Manifest Merger tool.Raphael2012-01-102-1/+8
| | | | | | | | | | | | Change-Id: Iae9033f04654e03151c206b5dfb1fd8f47eea8f2
* | | SDK Manager: fix missing label in Source categories.Raphael2012-01-102-0/+46
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | When listing packages by "repository" (e.g. by source URL), the name of external source isn't always set. It turns out that when processing packages, we load local packages first and only their source URL is known, not the "UI name" of the source so this results in categories with no known UI name *if* they have at least one local package installed. This changes the package loader so that it will try to adjust the label of a source even if it's loaded after the category has been created. Change-Id: I285fdefdae99c635d9fd139ca50d17706eea3ae6
* | Fix locale handling of uppercase/lowercaseTor Norbye2012-01-066-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset fixes issue 23747: i and İ character problem in turkish operating Systems... and probably many other bugs in the Turkish locale. Basically, we had a lot of String.toLowerCase() and String.toUpperCase() calls. This performs locale sensitive conversions, which in many cases is NOT what we want; for "machine readable" conversions we should be using Locale.US which performs no special cases. For more, see http://developer.android.com/reference/java/util/Locale.html#default_locale Change-Id: I996b0e70fb377e8dae484c5811deb8bc9afb684c
* | SDK: Extend CommandLineParser to support string arrays.Raphael2012-01-052-27/+150
| | | | | | | | | | | | | | | | | | This allows the parser to process an input such as: $ cmd verb --arg1 value1 --arg2 value2 value3 value4 or $ cmd verb --arg1 value1 --arg2 value2 -- -value3 --value4 Change-Id: I7ea6c019c2bb4ee5003bdba1f0774f3c062322c2
* | Move CommandLineProcessor from sdkmanager to sdklib as CommandLineParserRaphael2012-01-053-10/+11
| | | | | | | | Change-Id: I4413efea2887436d167ce44db6f0cd711bdf8fdd
* | Add @NonNull annotation and configure Eclipse settingsTor Norbye2011-12-223-3/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2178-24/+557
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-165-48/+89
|/ | | | | | | | | | 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: fix SWTException disposed when closing during a download.Raphael2011-12-081-16/+20
| | | | | | SDK Bug: 21312 Change-Id: I49462d9750c4f64f92372793dee65d28f23e94ab
* SDK Manager: shutdown httpclient to abort download.Raphael2011-12-081-2/+6
| | | | | | | | | | | | When a user aborts a download in the SDK Manager, we call the HttpClient InputStream.close(). It turns out this blocks till the download is complete. Issuing the client shutdown first makes it really close the connection, as indicated in the javadoc. SDK Bug: 21167 Change-Id: Ie68a60d60f482a0f7abaea084ffbf6700a0a9a3d
* SDK Manager: 'list sdk' show system images and source pkg.Raphael2011-12-052-15/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the 'android list sdk' to output the system images and source packages in the list. Since there are no hard dependencies on them, they were not listed. The behavior is changed to: - 'android list sdk': display all potential and mandatory updates and their dependencies. - 'android list sdk --obsolete': display everything compatible on the remote sources. This allows users to install sources and system images from the command line: $ android list sdk -e -o $ android update sdk -u -o -t source,system-image # all $ android update sdk -u -o -t source-14,sysimg-14 # API14 Also, although system images are not mandatory (e.g. they are not hard dependencies of platforms), the heuristic is that if a platform doesn't have any system image of its own we'll suggest any matching sys-image we can find for either new platform or the currently highest installed one. SDK Bug: 21880 Change-Id: I4c47c6e60d885ebeaf181288db743b382fdb1618
* Merge "SDK android.exe: fix "access denied" error."Raphael2011-12-023-23/+45
|\
| * SDK android.exe: fix "access denied" error.Raphael2011-11-293-23/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue was a typo and the script was setting the files as read-only (instead of clearing the r-o attribute, it was setting it) before trying to copy them. Also reverted the code that hides the launched app window so that the sdkmanager actually be visible. SDK Bug: 5683762 Change-Id: Id23302981f84b227361c6208fe6ef512e0ac2de3
* | Merge "SDK: Extract find_java static library."Raphael2011-12-016-479/+628
|\ \ | |/
| * SDK: Extract find_java static library.Raphael2011-11-296-479/+628
| | | | | | | | Change-Id: Ic8b2130a327d73c044c0931509385aed19f78a9e
* | SDK Manager: verbose print if unzip fails.Raphael2011-11-301-2/+14
|/ | | | | | | | | | | | | | | The core issue was that source packages were not properly zipped on the build server side, which made the unzip crash with an EOFException. This simply adds a better verbose message in case this happens again. It seems the Java ZipFile bug listed in there is fixed at least in the JVM I'm currently running (1.6 and 7) but anyway I added the extra safeguard code as documented in the reported bug (e.g. don't ask ZipFile to unzip more than the actual size of the entry.) Can't hurt to have it. Change-Id: Ib47530920474e320da69c35d9a695d931bed55c1
* SDK: Switch back to android.bat.Raphael Moll2011-11-282-2/+2
| | | | | | | android.exe is not ready for usage yet. The local sdk parser can still detect both. Change-Id: I597f9b5553628b55703aa12282b2808c0b6d1fb1
* SDK: Fix C++ style for win_android.cppRaphael2011-11-171-42/+50
| | | | | | This addresses CL feedback from Change I7275cfee Change-Id: Ie86dc2efc0a26c783b63e45db32b9d388a6562b1
* sdkman authdialog: Make input fields static.Siva Velusamy2011-11-161-12/+16
| | | | | | | This enables maintaining user input between multiple invocations of the dialog during a single session. Change-Id: Id391ce8e23d65ab20ceba117c89bc8b9c9e2240f
* SDK Manager: remove obsolete sdkamn v1 window.Raphael2011-11-158-1790/+9
| | | | | | | | | This removes the SDK Manager 1 window implementation. There are still a few odds and ends that require some cleanup for later, e.g. the "update chooser dialog" but it actually needs a revamp rather than just a cleanup. Change-Id: Icb90fd1f5d9d8ca4b1ffeea72b8c20aed12cbe26
* Merge "SDK: Switch from android.bat to android.exe"Raphael2011-11-152-7/+14
|\
| * SDK: Switch from android.bat to android.exeRaphael2011-11-142-7/+14
| | | | | | | | Change-Id: I549340bdaaf78d6d314992ad2b91e9b45f97d2c2
* | Merge "android.exe, replacement for android.bat on Windows"Raphael2011-11-158-0/+1026
|\ \ | |/
| * android.exe, replacement for android.bat on WindowsRaphael2011-11-148-0/+1026
| | | | | | | | Change-Id: I7275cfeeec53511b1679c203a149b801e137b921
generated by cgit v1.1 at 2025-02-02 21:11:37 +0000