aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager
Commit message (Collapse)AuthorAgeFilesLines
...
* SDK Manager: fix link to AVD Manager.Raphael Moll2012-04-026-284/+9
| | | | | | | | | | | The AVD Manager still had remnants of the obsolete "pages" mechanism removed in change I7f4f3941. That was making it crash with an NPE when started from the SDK Manager. SDK Bug: 6272923 Change-Id: I1f010c016e1db0e884aea7beda23ead6f47df70e
* Merge "SDK Manager: remove obsolete "pages" mechanism."Raphael Moll2012-03-289-308/+226
|\
| * SDK Manager: remove obsolete "pages" mechanism.Raphael Moll2012-03-279-308/+226
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Use our own signing code in Ant and don't rely on Jarsigner.Xavier Ducrohet2012-03-273-2/+37
|/ | | | | | | | | | JDK7 changes the default signing algorithm and breaks release builds where the ant script does the signing after building the apk. This changes the Ant script to use a custom task that uses the same code that is already used to sign debug apps. Change-Id: I0df7378a7a59b54ef6a17db363a2127736f4434e
* 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
* AVD Manager: don't auto-close 'start emulator' when there's an error.Raphael2012-03-123-92/+128
| | | | | | | | | | | | | | | | In the AVD Manager, don't automatically close the 'start emulator' progress dialog if the emulator has output an error. A few emulator messages are output to stderr which are not errors and a few others are sent to stdout which are not worth printing or an actually errors, so this tries to adjust the severity accordingly and guess when the window should be kept open to read these messages. SDK Bug: 26564 Change-Id: I98c63b38773f395f2f0c0b6112b81b65c10c82f6
* SDK Manager: fix doc updates not being visible.Raphael2012-03-091-20/+20
| | | | Change-Id: I993de075c265745d1db0732ae7936ce23dfd333e
* SDK Manager: Add Mips support.Raphael2012-03-099-8/+36
| | | | | | | (based on ae7878a5426e5df22634b449a76d59626d038713 and adapted to tools_r17.) Change-Id: If8312af7f385cbe6e066657ef7e63ab8fd758424
* Merge "NPW: Find samples in extras."Raphael2012-03-094-76/+261
|\
| * NPW: Find samples in extras.Raphael2012-03-094-76/+261
| | | | | | | | | | | | | | | | | | | | | | | | Changes: - the SdkManager can now list extras that contain a "samples" directory. - The NPW uses that to list samples from extras that match the requested API level. The name of the sample in the list also indicates the extra's display name. Change-Id: Id6609f53b9ba84126e36bc33e5675ec6a0284814
* | Ant build now sanitize jar files in setup task.Xavier Ducrohet2012-03-071-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the list of jar files was sanitized (to remove duplicates) in the dex task, but this meant the full list (with duplicates) was passed to proguard when building in release mode. This changeset move the sanitization of the jar files in the Setup Task so that the script later only deals with a sanitized list. The means the content of libs/*.jar for the current project must be looked at in the task instead of later in the XML script. Change-Id: Ib5253b80ee7c1ded004bcdad6184e0900b7a7543
* | Merge "Figure out DX input path based on actual classpath."Xavier Ducrohet2012-03-071-5/+20
|\ \
| * | Figure out DX input path based on actual classpath.Xavier Ducrohet2012-03-071-5/+20
| |/ | | | | | | | | | | | | | | | | | | | | | | | | This synchronizes the previous work on figuring out the actual classpath for the library container and reuse this to figure out what goes into dex. Also use the classpath to figure out the java resources that should be packaged in the apk. Additionally, only add java resources by reading the output folder instead of the source folders as this ensure that exclusion patterns are respected. Change-Id: Iac742f4bdefab370ec3cf7d955736e84d58ead9c
* | Merge "SDK: generate repo using latest schemas."Raphael Moll2012-03-072-3/+16
|\ \
| * | SDK: generate repo using latest schemas.Raphael Moll2012-03-012-3/+16
| | | | | | | | | | | | | | | | | | | | | Requires dev.git change I250fe7a3 to build properly. Also requires Change Ia307af09 for addon. Change-Id: Ib0363f06ce2754c58b5f2ba31c4f0720b933f0d8
* | | SDK Manager: tweak addon comparison to support new schema.Raphael2012-03-071-23/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This slightly tweaks the comparison between addons so that the SDK Manager list can properly support a list containing addons with solely <vendor> vs similar ones that have <vendor-id> and <vendor-display> without creating duplicates. Change-Id: Id1639f73466d7e3f9912e3a0d730bfc74444e27e
* | | SDK Manager: display tooltip for update packages.Raphael2012-03-062-26/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | When an item is both installed AND has an update available, this changes the SDK Manager tooltip to show info for both packages. This becomes particularly helpful when an extra or addon can suddenly change names after an update. Change-Id: Id96f161c0c4b3ace39cb00b6910f26080e6c15a4
* | | SDK Manager: support platform previews.Raphael2012-03-062-29/+36
| |/ |/| | | | | | | | | | | | | | | | | | | | | This allows the SDK Manager to create a group for platform previews (api + codename) which is separate from the api it overrides. There's a latent issue with the fact that addons do not support codenames. This should only happen on nightly builds and not on officially released platforms though. Change-Id: Ic5095ece6ad9c978274801598aa1dc29c60974d8
* | Automatically add dependencies to Eclipse project.Xavier Ducrohet2012-03-021-15/+33
|/ | | | | | | | | add libs/*.jar from Library Projects, add Java-only projects only that referenced in Library Projects (recursively so that Java projects that reference other Java projects pull those in too). Also add jar files referenced by Java-only projects. Change-Id: Ic2b10107153e0576f5e6ba34d50bd3fef95c3fea
* Fix issue when a project and its libraries use the same jar files.Xavier Ducrohet2012-02-241-0/+442
| | | | | | | | | | | | | | | | | | | | | | | | | | This is only an issue in Ant because in Eclipse we don't automatically pull the jar files from libraries into the main project (we should somehow now that we have the Library Projects jar container that is dynamic). Right now we do a simple size/sha1 check on libraries that have the same name to figure out if they are the same version. If they are we only use one in the dex step (that notoriously fails to add the same class twice). If they are different we stop the build as it's an error (having two library projects depending on two different versions of a jar file should be an error as we can be sure the two versions are API compatible). For later: not use the file name only? find a way to version the libraries and to have them declare whether they are API compatible with older versions? Also added a hard-coded case for the Android Support Library. If both the v4 and the v13 are detected, use the v13 only as it includes the v4 already. New test apps. Three cases: - main and library projects with duplicate jar files that are identical - main and library projects with duplicate jar files that are NOT identical - main and library projects with v4 and v13 in the dependency list. Change-Id: I3a9abdcbec635d7c9d3228bdd105120f77178b27
* SDK Repository: add "beta release candidate" tag to XSDRaphael2012-02-222-5/+62
| | | | | | | | | This adds an optional integer>0 as "beta release candiate" to repository packages. This will be used in tools 18 to allow us to push beta versions of packages and still know how to update them compared to non-beta packages. Change-Id: I2f0d3cb75171bc23bce1eb511a4e3b86ca97245b
* 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