aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager/libs/sdklib
Commit message (Collapse)AuthorAgeFilesLines
...
* 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-1512-124/+306
| | | | | | | | 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-1518-205/+1220
| | | | | | 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
* 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-067-20/+101
|\ \ | |/
| * SDK Manager: extract source packages as r-o.Raphael2012-02-067-20/+101
| | | | | | | | | | | | | | | | 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-102-1/+8
| | | | | | | | 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-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-052-0/+1083
| | | | | | | | 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-2140-12/+267
|/ | | | | | | | | | | | | | | | | | | | | 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-125-23/+81
|/ | | | 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-015-10/+42
|/ | | | 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
* | Platform now returns the new location of the renderscript includes.Xavier Ducrohet2011-10-212-5/+11
| | | | | | | | | | | | http://code.google.com/p/android/issues/detail?id=21006 Change-Id: Ice55f026e9d78922bfa359edad62630a8f7fb8ed
* | Merge "Fix AVD Manager creation for GTV issue."Raphael2011-10-211-5/+2
|\ \
| * | Fix AVD Manager creation for GTV issue.Raphael2011-10-211-5/+2
| |/ | | | | | | | | | | SDK Bug: 20963 Change-Id: I46b8e808f2eb0c008b60036631a4d061d02085c6
* | SDK Manager: label incompatible packages.Raphael2011-10-212-1/+24
|/ | | | | | | | | - Clearly states that a package is not compatible. - Provides an env var to work around and install anyway: $ export ANDROID_SDK_IGNORE_COMPAT=1 $ tools/android Change-Id: I5d94fbe452c72572054b2aecb781acfe3519135c
* Merge "SDK Manager: env var SDK_TEST_BASE_URL"Raphael2011-10-173-2/+17
|\
| * SDK Manager: env var SDK_TEST_BASE_URLRaphael2011-10-143-2/+17
| | | | | | | | | | | | | | | | | | Support a new env var SDK_TEST_BASE_URL that should be set to the root of an alternate repo. When set it will completly override the built-in default repository base URL. Change-Id: I4852d4c60aac19e2e5c7c34d848b15254d93afb6
* | Merge "Add BuildConfig to ant SDK project."Xavier Ducrohet2011-10-143-0/+146
|\ \ | |/ |/|
| * Add BuildConfig to ant SDK project.Xavier Ducrohet2011-10-143-0/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The BuildConfig class contains a single boolean constant called DEBUG which is true only for debug/instrumented builds. This allows developers to create debug only code that's automatically stripped from release builds. Also fixed some issues with dependency check for other tasks, notably the aapt task that would always find new files due to not filtering out files that are ignored by aapt itself (hidden files, version control files, etc...) Change-Id: I4391a87c064a185d6b337ca46e3a9f0e43c5174d
* | Merge "SDK Manager: fix duplicated Extra Packages."Raphael2011-10-141-1/+6
|\ \
| * | SDK Manager: fix duplicated Extra Packages.Raphael2011-10-131-1/+6
| |/ | | | | | | Change-Id: I0518515a2095b63099cb69d67d110330b148d5a2
* | SDK Manager: don't output XML parse errors to stderrRaphael2011-10-131-0/+15
|/ | | | | | | | | | | | | | This is exactly like change I6f82b040 except now we remove the stderr output when parsing the addons_list.xml To put this in context, end-users should not see any xml parsing error. In this case we get one because the file doesn't exist on the test server and the web server returns an HTML page describing the error, which naturally fails to validate against our XSD. But since the point of the method is just to validate, errors are irrelevant. Change-Id: I80b2c7600d1ceffa870ac3d71ef0c0f6ef9f809c
* SDK Manager: Prevent 'adb start-server' from blockingRaphael2011-10-111-100/+27
| | | | | | | | | | | | | SDK Manager hangs on windows after it tries to stop and restart ADB (e.g. when installing platform-tools). It hangs when capturing the stdout/stderr pipes -- these don't close automatically when the process has finished and these are not interruptible streams. One workaround is to not capture them, especially since the output isn't really useful for the installer anyway. Change-Id: I6554461dfffad2cc8ff0f1fe7d212fdee742e2e6
* SDK Manager: don't output XML parse errors to stderrRaphael2011-10-071-0/+28
| | | | Change-Id: I6f82b040e8a2f91c24b7e75b3371f249b0b0f383
* Fix NPE: for some properties, description was null.Siva Velusamy2011-10-051-0/+9
| | | | | | See http://code.google.com/p/android/issues/detail?id=20447 Change-Id: I7db8f16b4027a9f4582c4a70bf8ad1c048ae7006
* SDK: fix SdkManager class not releasing FileInputStreamRaphael2011-10-041-2/+18
| | | | | | | | | | | | | | | | In various parts of the code base, I see code that creates a FileInputStrea and never closes it. Unfortunately on Windows that means the file will stay locked for as long as the java process is alive. In this case the SdkManager wasn't closing to input streams which makes the source.properties files locked, and thus it makes it impossible to upgrade/delete the corresponding packages. There are more occurences of this elsewhere in the code. Change-Id: I9f0a854b210411757eee8b4ebf8308b059206542
* SDK Manager: Fix NPE when deleting local archiveRaphael2011-10-0412-23/+58
| | | | | | | | | | Properly enforce that all local archive should have an actual installation path to be considered local. This was missing in the system image and the source archives introduced last week. Change-Id: I3e4abd3c4136c9be73061e207e42e2d3cc22ca8b
* Merge "Make source.prop more important than build.prop when parsing platforms."Xavier Ducrohet2011-10-041-99/+98
|\
| * Make source.prop more important than build.prop when parsing platforms.Xavier Ducrohet2011-10-041-99/+98
| | | | | | | | Change-Id: I715a7503a7be2b28cd89bd441b8cbb5ee620ccac