aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager/libs/sdklib/src/com/android
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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-046-13/+22
| | | | | | | | | | 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
* | Merge "SDK: Use a different repository-N.xml for updating."Raphael2011-10-044-17/+84
|\ \
| * | SDK: Use a different repository-N.xml for updating.Raphael2011-10-044-17/+84
| |/ | | | | | | Change-Id: I566b6945b7d31c3bfe52b834014beb3f37a098d8
* | SDK: revert c649a334 and fix missing \n properly.Raphael2011-10-042-3/+3
|/ | | | Change-Id: I4affda9be00c37c4a801816625f57f7eda585ef4
* SDK: Fix bug that prevents repo XSD upgradesRaphael2011-10-031-1/+1
| | | | | | | | | | | This fixes the bug in the current code. We're going to switch to a different upgrade mechanism, rendering this code useless, but I'd still have this checked in for the record: the issue is that the temporary node is mixed up and the attributes use the element name instead of their attribute names. Change-Id: I3abcfd476494ee2ddb8b75789b346e86556d8d85
* Merge "SDK: fix missing \n in 'android create avd'"Raphael2011-09-301-1/+2
|\
| * SDK: fix missing \n in 'android create avd'Raphael2011-09-301-1/+2
| | | | | | | | | | | | SDK Bug: 20430 Change-Id: Id427390c799165a1dff07530c6fce48488193055
* | SDK repository: support for source packages.Raphael2011-09-2710-13/+414
|/ | | | Change-Id: Ib8df984ddbad0bb6f0eb4c2fb0bd4b9c49b334cc
* Merge "Add dependency support for ApkBuilder ant step."Xavier Ducrohet2011-09-232-19/+79
|\
| * Add dependency support for ApkBuilder ant step.Xavier Ducrohet2011-09-232-19/+79
| | | | | | | | Change-Id: I7230a2aa3df5fab8b420f1ed2f359621fbda7f5a
* | Merge "Add support to make identity files from the command line."Xavier Ducrohet2011-09-231-0/+105
|\ \
| * | Add support to make identity files from the command line.Xavier Ducrohet2011-09-231-0/+105
| | | | | | | | | | | | Change-Id: Ifaa1b4653ea6c1b311e711bd285d08afb0d3e12c
* | | Display the full error info for broken packages.Raphael2011-09-211-5/+14
|/ / | | | | | | | | | | | | | | | | The BrokenPackage contains a "long description" that contains the error (why it is broken). We need to use that and not override it with the base package description. Change-Id: I3eff79f2f9aabd54c2f1eaf7b671bdfe929627df
* | Merge "Enable SDK Repo to use latest XSD versions."Raphael Moll2011-09-194-0/+0
| | | | | | | | | | | | | | | | | | This requires development.git Change-Id If3beb09a to build. Manual cherry-pick of b889a8783158f156bc95ec3c63cccd60e210f1d1. Apparently it wasn't auto-merged automatically. Change-Id: I12f9da8e5348e8524294866f3e400110926e8317
* | SDK: change way system image packages are loaded.Raphael2011-09-183-34/+86
|/ | | | | | | | | This change the system image packages to not care about the directory name of where they are located and instead enforce the presence of a source.properties file. Change-Id: I580a0c04a453297ae7ddf9de8e012fd65d34d776
* SDK Manager: Extract all source.properties constants.Raphael2011-09-1812-100/+158
| | | | | | | | | | The SDK Manager uses specific constants to save local source.properties files in installed packages. This moves all these constants in a common constant class and makes it explicit that these constants form some kind of API that can't be changed arbitrarily. Change-Id: I005f13f53768fbcc677edf94be0b4c13e19e3ec8
* SDK Manager: make 'list sdk' ids deterministic.Raphael2011-09-1611-5/+262
| | | | | | | | | | | | | | | | | | | | | | | | | | This changes 'android list sdk' to output deterministic install IDs. These IDs can then be give to 'android update sdk'. Example of usage: $ android list sdk --extended Refresh Sources: [...] ---------- id: 2 or "android-13" Type: Platform Desc: Android SDK Platform 3.2, revision 1 [...] ---------- id: 41 or "extra-google-usb_driver" Type: Extra Desc: USB Driver for Windows, revision 4 $ android update sdk --no-ui --filter android-13,extra-google-usb_driver => This installs the platform API 13 and the USB Driver. SDK Bug: 19504 Change-Id: I3109c90371d292df4e9cf845208bf8efe774233f
* Merge changes I74718caa,I5811c160Raphael2011-09-132-3/+3
|\ | | | | | | | | | | * changes: SdkManager: double selection on tree viewer. Tweak sdk manager progress bar.
| * SdkManager: double selection on tree viewer.Raphael2011-09-132-2/+2
| | | | | | | | Change-Id: I74718caa48a59f132b6d37988625376c312bba27
| * Tweak sdk manager progress bar.Raphael2011-09-131-1/+1
| | | | | | | | Change-Id: I5811c1601578a9e6e53d59f13ba469d2ce7d767f
* | New Project Wizard overhaulTor Norbye2011-09-131-3/+5
|/ | | | | | | | | | | | | | | | | | | | | This changeset splits the New Project Wizard into multiple logical wizards (a separate one for samples, testing and plain projects), and each wizard contains multiple pages - such as a separate page for SDK selection, a separate page for Sample selection, a separate page for Test target selection, and so on. In addition, sample projects are now copied into the workspace itself such that they can be modified and deleted without affecting the mater copy in the SDK install directory. Samples can also be accessed from a new separate entry in the New wizard. The SWT code is now maintained with WindowBuilder. Most of the code in NewProjectWizard was related to actually building the projects, and this code is preserved in the new NewProjectCreator class which is used by unit tests etc such that we don't need to create a stub wizard and stub wizard page anymore. Change-Id: I64872722e320a109870403d25fdf051270b526ed
* Load standalone system images in the SdkManager.Raphael2011-09-0810-115/+631
| | | | | | | | | | | | | | | | | | This revamps the way system images are handled in the internal SdkManager class. Before, a given IAndroidTarget could provide a list of ABI strings it new about, discovered by parsing the SDK/platform/images/xyz or SDK/addon/images/xyz folder. This introduces the notion of System Image to an IAndroidTarget. A system image combines an ABI with a location strategy (legacy images folder, images sub-folder or standalone sdk/system-images folder) and an actual location path. Change-Id: If5b748aa9aef6788bc3c814818381c7918b40bca
* Merge "Add missing NON-NLS to SdkConstants."Raphael2011-09-071-91/+96
|\
| * Add missing NON-NLS to SdkConstants.Raphael2011-09-071-91/+96
| | | | | | | | | | | | Not stricly needed, but it's nice to uniformize the file. Change-Id: Ia3930f46d465588ccb1b071679661f567bea8bce
* | Merge "More support for standalone system image packages."Raphael2011-09-072-15/+41
|\ \ | |/
| * More support for standalone system image packages.Raphael2011-09-062-15/+41
| | | | | | | | Change-Id: I084c3b4916b1ce69ba602ced5be308f0d215eff8
* | Merge "Fix SdkManager.UrlOpener to support file:// URLs."Raphael2011-09-071-0/+16
|\ \ | |/
| * Fix SdkManager.UrlOpener to support file:// URLs.Raphael2011-09-061-0/+16
| | | | | | | | | | | | | | | | The new Apache HttpClient code doesn't support local file:// URLs. For any unsupported protocol, retry using the class java.net.Url.open method. Change-Id: Ie01499b372a3f5e1a217e0b51fd4a07c216164fb
* | Change default launcher icon name in new Android projectsTor Norbye2011-09-061-5/+8
|/ | | | | | | | | | | | | | | | | When creating a new project, the default project template includes a launcher icon named "icon.png". This changeset changes the name of this default icon to "ic_launcher.png", in accordance with the recommended naming convention listed in http://developer.android.com/guide/practices/ui_guidelines/icon_design.html (The secondary motivation for this is that the Icon Set Wizard will suggest ic_launcher as a default launcher name, and it would be nice if going through the wizard with the default settings would replace the current project's launcher icon. Given the guidelines above I'd rather not change the wizard default name to "icon") Change-Id: I9f516c769019c2635edad4e1e6f01a5110d156fe
* Add SystemImagePackage definition to sdkmanager.Raphael2011-09-064-1/+264
| | | | | | | | This just adds the type and check we can parse it out a sample XML. This CL does not yet use the system image package where needed. Change-Id: Id2d83c9e216256c329a88dced9e274da0ab651f0
* SdkManager: support <included-abi> in platform packages.Raphael Moll2011-09-064-8/+41
| | | | | | | | | | | This is part of a series of CL to add support for system-image packages separated from platform packages. In this small CL we just add the <included-abi> element to platform packages, load/save it and test by loading a sample XML. Change-Id: Icbf554ea398bbcfe5cf760f9d25aec3de088937a
* Cleanup javadoc references in sdklib.Raphael2011-09-021-2/+5
| | | | Change-Id: I2173944aeb3f18fc58d19fcf80ec186743dba56a
* SDK Manager2: fix large downloads.Raphael Moll2011-09-014-38/+39
| | | | | | | | | | | | UrlOpener was using a BufferedHtmlEntity reader. As a consequence its getContent() was loading large packages in memory and resulting in OutOfMemory exceptions, whilst at the same time blocking and thus rendering the download progress report useless. This fixes it by simply passing through in the underlying stream and freeing resources when the stream is closed. Change-Id: Ib3b265953931fecdf202197230ee9f24d8178faa