aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager/libs
Commit message (Collapse)AuthorAgeFilesLines
* SDK Manager: fix parsing of empty AndroidVersion codename.Raphael Moll2012-05-075-26/+114
| | | | | | | | | | | | | | | | | SDK Bug: 29952 To reproduce the bug, install any system image with the SDK Manager and add the line "AndroidVersion.CodeName=" in the source.properties. When the SDK Manager loads, it will incorrectly flag the system image as "broken" because it can't understand the empty codename. This fixes it by sanitizing the codename when creating an AndroidVersion and using that class when loading the properties instead of hand checking the codename in various places. Change-Id: Ie4a02739e56f576c7644b5539697c943d0082aac
* SDK Manager change format of revision property.Raphael Moll2012-05-0411-40/+230
| | | | | | | | | | | | | Instead of storing the full revision as 4 separate properties, this stores it using the legacy "Pkg.Revision" property with the "1.2.3 rc4" format. It reduces the number of properties to maintain, it's more human-readable and it's easier when we want to have min-tools-rev be a full revision in the next CL (otherwise it means 4 more properties, etc.) Change-Id: I94ebc4786e83c5b565a6d3a33d11efdfda6f72c5
* SDK: cleanup all the Integer.parse(getProperty) calls.Raphael Moll2012-05-039-46/+67
| | | | Change-Id: Iee113eb3341f6aab65d65654505c5fedcfaff9a1
* SDK: Rework repository-7.xsdRaphael Moll2012-05-0328-222/+364
| | | | | | | | | | | This changes the XML schema for repository-7 to put the "full revision" in its own <revision> element with 4 sub-elements (major/minor/micro and preview). Next step is to reuse this for min-[plat-]tools-rev for dependencies. Change-Id: I644f08e7383987682f8b0b31175ce58d02fd8751
* Rework SDK Manager support for major.minor.micro revisions.Raphael Moll2012-05-0329-228/+812
| | | | | | | | | | | | | | | | | | | 2 things in this CL: - There's a bit of refactoring: - PreviewVersion becomes FullVersion (which is a full major.minor.micro.preview) - And I introduce a MajorRevision (which is just a major number) - Package.getRevision() returns one of these revision objects instead of an integer which leads to a multide of small boring changes. - Changed the PackageDiffLogic and its test to adequately use the new revision; "tools preview" packages are placed in their own category and releases can update previews but not the reverse. Change-Id: Ia80fd9a3791919e827ce0d183c0f297f0d27f2e6
* Merge "SDK Tools pkg support for major.minor.micro revisions."Raphael Moll2012-05-0341-126/+2236
|\
| * SDK Tools pkg support for major.minor.micro revisions.Raphael Moll2012-04-3041-126/+2236
| | | | | | | | | | | | | | | | | | | | | | For tools and platform-tools, we'll support a revision in the form "major.minor.micro rc#". The fourth one is a preview/release candidate number. This allows us to have revisions 18, 18.1, 18.0.1 and 18 rc1, etc. Change-Id: I8a41491d4cd8798f1b71ed7f3484d9293fee81bc
* | sdklib: update classpath to get mkidentity from prebuiltsSiva Velusamy2012-04-301-1/+1
|/ | | | Change-Id: Ic0e471830b373b8e46e0c6817f4ccf37aaf2a143
* New env-var to disable SDK Manager cacheRaphael Moll2012-04-271-1/+7
| | | | Change-Id: Ia1c0ae789f173aca0832c1c7c1f6679645611f9b
* SDK: XML to export platform stats.Raphael Moll2012-04-236-0/+1069
| | | | | | This would be used later by the NPW. Change-Id: Iec6f24182f234d83217d83f0087aa92eabb7609d
* Reorganize sdklib.repository packages.Raphael Moll2012-04-2176-254/+417
| | | | | | | | | | | 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
* Merge "Fix lib properties on windows."Xavier Ducrohet2012-04-182-4/+10
|\
| * Fix lib properties on windows.Xavier Ducrohet2012-04-172-4/+10
| | | | | | | | | | | | | | This is a very crude first fix while we figure out how to properly escape/unescape all chars. Change-Id: I783f8fdfd802e1a8ff44bbc7f6056fb607a3e523
* | SDK: Open AVD Manager from from AVD Selector > Manager.Raphael Moll2012-04-174-21/+26
|/ | | | | | SDK Bug: 29026 Change-Id: I036bcd7e23210ebf3991b56211c38c077ef3d308
* 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
* | Fix "ant test" + misc clean up / reorganization of build.xmlXavier Ducrohet2012-04-164-9/+32
|/ | | | | | | | | | | | | | | | - 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
* SDK: Fix classpath for eclipse projects.Raphael Moll2012-04-121-1/+1
| | | | | | | | | | 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-052-6/+6
| | | | | | 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
* SDK: unit test for SdkSourceProperties.Raphael Moll2012-04-043-36/+220
| | | | | | Also fix a name changed in the SdkUiLib test. Change-Id: I30fa83ac607fc4735af161604514f09c2aff6a93
* SDK Manager: Remember last seen source names.Raphael Moll2012-04-035-87/+230
| | | | | | | | | | | | | | | One issue in the SDK Manager is that sources that are partially installed first are loaded first. However we used to remember the source URL but not its name, resulting in some sources having no visible name when loaded from installed packages. This solves the issue by storing the known source names locally. This expands on the local settings file that stores whether a source is enable/disable to add more attributes. Change-Id: Ideca00820ccad01b4cacd997b1e43b53270fa1bc
* SDK Manager dialog to enable 3rd party addons.Raphael Moll2012-04-0312-380/+991
| | | | | | | | | | | | | | | - Change AddonUser dialog: transform current dialog in 2 pages. One is for user to add custom addon site URLs (like the dialog was doing before, unchanged.) - Other tab is to select which official addon sites should be enabled. - Support enable/disable state for each source. - Display disabled sources as such in the tree when in "per-repository" view. - Persist the enable bit state via local pref file. - Refactor a few inner classes out of PackagesPage. Change-Id: Icc8e392d90550e53f1c76dd7aefb31669219973b
* Revert "Switch libraries from Eclipse 3.4 to Eclipse 3.6.2"Tor Norbye2012-04-031-3/+3
| | | | This reverts commit b0c819f896b3c579633849e3fa674a30e6978dd7.
* Switch libraries from Eclipse 3.4 to Eclipse 3.6.2Tor Norbye2012-04-021-3/+3
| | | | | | | | | | | 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: 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-288-198/+460
|\
| * SDK Manager: remove obsolete "pages" mechanism.Raphael Moll2012-03-278-198/+460
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* 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