aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager/libs/sdklib/src/com/android
Commit message (Collapse)AuthorAgeFilesLines
...
* SDK Manager dialog to enable 3rd party addons.Raphael Moll2012-04-032-60/+264
| | | | | | | | | | | | | | | - 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
* 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: fix doc updates not being visible.Raphael2012-03-091-20/+20
| | | | Change-Id: I993de075c265745d1db0732ae7936ce23dfd333e
* SDK Manager: Add Mips support.Raphael2012-03-097-5/+18
| | | | | | | (based on ae7878a5426e5df22634b449a76d59626d038713 and adapted to tools_r17.) Change-Id: If8312af7f385cbe6e066657ef7e63ab8fd758424
* Merge "NPW: Find samples in extras."Raphael2012-03-093-76/+202
|\
| * NPW: Find samples in extras.Raphael2012-03-093-76/+202
| | | | | | | | | | | | | | | | | | | | | | | | 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-061-0/+11
| |/ |/| | | | | | | | | | | | | | | 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
* | 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-156-90/+244
| | | | | | | | 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-1510-124/+601
| | | | | | SDK Bug: 21942, part 1 of 2. Change-Id: Id9c026965b365e57302c56620f4ec8f88573d633
* SDK Repository: remove <extra> from repository.xmlRaphael2012-02-152-1/+558
| | | | | | | | | | | | | | 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
* SDK Manager: use find_lock.exe when install dir is locked.Raphael2012-02-092-38/+135
| | | | | | | | | | 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
* 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
* 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-065-17/+92
|\ \ | |/
| * SDK Manager: extract source packages as r-o.Raphael2012-02-065-17/+92
| | | | | | | | | | | | | | | | 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
* | Manifest Merger tool.Raphael2012-01-101-1/+1
| | | | | | | | Change-Id: Iae9033f04654e03151c206b5dfb1fd8f47eea8f2
* | Fix locale handling of uppercase/lowercaseTor Norbye2012-01-065-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-051-26/+91
| | | | | | | | | | | | | | | | | | 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-051-0/+895
| | | | | | | | Change-Id: I4413efea2887436d167ce44db6f0cd711bdf8fdd
* | Update SDK codebase to JDK 6Tor Norbye2011-12-2131-9/+159
|/ | | | | | | | | | | | | | | | | | | | | 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: 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: 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
* 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
* | Add support for NTLM proxy authentication.Siva Velusamy2011-11-124-20/+80
|/ | | | Change-Id: Ia8375444bf99b33396616a57e781adb22d82175d
* Merge "Add support for BuildConfig class to ADT."Xavier Ducrohet2011-11-101-3/+17
|\
| * Add support for BuildConfig class to ADT.Xavier Ducrohet2011-11-091-3/+17
| | | | | | | | Change-Id: I17d4eae699e55e41c26c6125175b893a3012699e
* | SdkManager: rework pkg diff to avoid duplicatesRaphael2011-11-013-6/+38
|/ | | | Change-Id: Iad1576ec4ca03213679aabb97328bcf9c0f590eb
* SDK Manager: change addons_list.xml download URL.Raphael2011-10-241-4/+4
| | | | | | SDK Bug: 5508174 Change-Id: I14ab4163e0f07824226cc78f72b538e2f82d7c5f
* Merge "Prevent NPE in 'android update project'."Raphael2011-10-211-0/+4
|\
| * Prevent NPE in 'android update project'.Raphael2011-10-181-0/+4
| | | | | | | | | | | | | | | | SDK Bug 20535. Doesn't seem reproducible, so just defend against a potential NPE anyway. Change-Id: Ieb6a0958c7585ea3c5cffbb640943263a14e4c60