aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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-215-9/+51
|/ / | | | | | | | | | | | | | | | | - 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: Fix typos."Raphael2011-10-191-12/+2
|\ \ | |/
| * SDK Manager: Fix typos.Raphael2011-10-181-12/+2
| | | | | | | | | | | | Should have been in a3e43f30cf2278afd5dbc5864442529129b3a057 Change-Id: I9018f8b3b0e5bfb07b05acba9d1c6d4fae04181a
* | SDK Manager: fix window resize issue.Raphael2011-10-192-3/+3
|/ | | | | | | | | | SDK Bug: 20939 Incidentally, this also fixes the fact that the window for the SDK/AVD manager can't be resized at all on Windows when started from ADT. SWT is quite magical. Change-Id: I282ebdac3e42e39ee41247de5591cfcb61cd4ac8
* Merge "SDK Manager: change initial selection logic."Raphael2011-10-183-85/+193
|\
| * SDK Manager: change initial selection logic.Raphael2011-10-183-85/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the way packages are selected: - When using the "Select New" link, all new stuff is selected. - When using the "Select Update" link, only installed stuff with updates is selected. - When starts the SDK Manager, the heuristic becomes: - Select any updates we can find. - Check whether the top platform is installed. - If not at all, select all its packages. This should cover the "there's a new platform available" scenario by just selecting to install everything for it. - If the top platform has at least one item selected, make sure the platform package itself is installed or select it. - If the platform currently installed or a selected update lacks a system image, we want to suggest some kind of system image. For that, look whether the platform (current or selected update) provides one. If they don't select any system image package we can find. - On Windows, also suggest to install the USB driver. SDK Bug: 20607 Change-Id: Ifab423b226ad708e9117eefd4d76033d866c57a8
* | Merge "Code cleanup: make sure FileInputStreams are closed."Raphael2011-10-181-1/+13
|\ \ | |/ |/|
| * Code cleanup: make sure FileInputStreams are closed.Raphael2011-10-131-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Various places of the code construct a new FileInputStream on the fly and give it to another method. One many occasions the stream is never properly closed, which can lock files on Windows. 2 specific cases: - Properties.load() doesn't seem to close its input (when looking at the source bundled with the JRE). - The doc of InputSource (used by various XML parsers like the pull parser) indicates the caller should in general not close the stream and the parser itself should do it. Change-Id: I622b54a22f97ed2c9c8fdc56ccde331207d9d212
* | Merge "SDK Manager: env var SDK_TEST_BASE_URL"Raphael2011-10-174-3/+41
|\ \
| * | SDK Manager: env var SDK_TEST_BASE_URLRaphael2011-10-144-3/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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-142-23/+39
|\ \ \
| * | | SDK Manager: fix duplicated Extra Packages.Raphael2011-10-132-23/+39
| | | | | | | | | | | | | | | | 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: display source of packages in tooltip.Raphael2011-10-134-1/+23
| |/ |/| | | | | Change-Id: I52484e7b61100d0c1656769cdce419416ed060c6
* | SDK Manager: Fix disabled quit menu on Mac.Raphael2011-10-122-18/+6
|/ | | | | | | This was due to the shell being marked as app_modal. SDK Bug: 20616 Change-Id: I1352fe4573f79890f2633be6140c1c63b79150b6
* SDK Manager: Remove APPLICATION_MODAL from shell style.Siva Velusamy2011-10-122-2/+28
| | | | | | | | | | | Have APPLICATION_MODAL causes the log window to never have focus. This patch has been tested only on Linux. Updated by Raphael: - Differentiate behavior for Linux. - Also apply to the AVD manager standalone window. Change-Id: Iff8461e26c3e36712083708969a781b9d5ed63c8
* SDK Manager: Prevent 'adb start-server' from blockingRaphael2011-10-113-106/+29
| | | | | | | | | | | | | 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: Display remote pkg revision.Raphael2011-10-111-4/+1
| | | | Change-Id: I24b49b4b09a9cab8cb1ddd2eade78e9ea21cd867
* SDK Manager: fix bug that prevents from installing pkg updatesRaphael2011-10-103-153/+204
| | | | | | | | | | | | | Purely an UI issue, the Install button is not enabled correctly for updates, thus preventing users from updating. Patch 2: changed to have the same code used for both enabling the buttons and actually selecting what to install or delete. That will avoid inconsistencies. Also prevented against a few potential NPEs. Change-Id: I3d209fa4325ffc7624c503395834636b372e8e7e
* Merge "SDK Manager: don't output XML parse errors to stderr"Raphael2011-10-101-0/+28
|\
| * SDK Manager: don't output XML parse errors to stderrRaphael2011-10-071-0/+28
| | | | | | | | Change-Id: I6f82b040e8a2f91c24b7e75b3371f249b0b0f383
* | SDK Manager: select just new or just updates.Raphael2011-10-073-16/+71
|/ | | | | | | | | | | | | | | | This splits the "Select New/Updates" link in the SDK Manager in 2 parts. Behavior is: - at startup, the sdk manager selects both new and updates. - one can click on deselect + select new to select just new packages. - one can click on deselect + select updates to select just update packages. - select does not select first, so clicking both new then update will produce the previous behavior. SDK Bug: 20607 Change-Id: Ib861d78b746f4f3c7a8fce421c89ae8094339933
* 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 Manager: fix handling of source URLsRaphael2011-10-052-34/+63
| | | | | | | | | | | | | This changes how source URLs are handled. Packages from different sources were previously treated as separate if the packages were the same (e.g. same platform API) but the source URLs were different. Instead this checks the hostname+domain name of the URL is different, as well as the type of the source (that is a sdk repository vs addon repository). Change-Id: I5ba133cd0dc984528bf696aef77d00cd9d31ed9c
* 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
* am ead5c918: Merge "SDK: fix typo in android.bat" into tools_r14Raphael Moll2011-10-041-2/+2
|\ | | | | | | | | * commit 'ead5c91879ab9a4b02f87da9134d44aaef5c1b8a': SDK: fix typo in android.bat
| * Merge "SDK: fix typo in android.bat" into tools_r14Raphael Moll2011-10-041-2/+2
| |\
| | * SDK: fix typo in android.batRaphael Moll2011-10-041-2/+2
| | | | | | | | | | | | | | | | | | This prevents httpcore from being copied correctly. Change-Id: I28d6b4020e854cbe914fd418e51e6a53e7c5444f
| * | Cherrypick 6a5504 from master. do not merge.Xavier Ducrohet2011-10-041-99/+98
| | | | | | | | | | | | | | | | | | Make source.prop more important than build.prop when parsing platforms. Change-Id: I126d4ed06fd1aa5125add58c17c3cebc4ec6b780
| * | SDK: use repository-N.xml by default. Do not merge.Raphael2011-10-041-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | (This is part of Change I566b6945 but I had forgotten to amend & upload, grrr.) (cherry picked from commit 46b86398f7287cbdc88a15f9f6a2418ba29a7dbc) Change-Id: I71ad810ac2ddbd11ece7f8e5afea22740a52100f
| * | SDK: Use a different repository-N.xml for updating. Do not merge.Raphael2011-10-044-17/+84
| | | | | | | | | | | | | | | | | | (cherry picked from commit 8f4710850b3a01d6e5f1188440c59d6999646858) Change-Id: I5d0c733267f04e4ad386ae3ae6853da2ecf9de15
| * | SDK: revert c649a334 and fix missing \n properly. Do not merge.Raphael2011-10-044-11/+62
| |/ | | | | | | | | | | (cherry picked from commit b4ea99769f2bc149ac3a3fef77c49b7b4b83fe90) Change-Id: Ifee9c7706f29f8ab2968c9277bdd293182df0900
| * SDK: fix missing \n in 'android create avd'. Do not merge.Raphael2011-09-302-1/+5
| | | | | | | | | | | | | | | | SDK Bug: 20430 (cherry picked from commit c649a334d7bc656ea3c00cd9d3d102c88fbf8f80) Change-Id: I8b4370b0d4ec4b96e9b65c214a9e06506b615a41
| * Cherrypick 0a6192 from master. do not merge.Xavier Ducrohet2011-09-286-28/+177
| | | | | | | | | | | | Add support to make identity files from the command line. Change-Id: Ieb11a6ac46790f244786a20ede930768946abc91
| * SDK repository: support for source packages. Do not merge.Raphael2011-09-2720-66/+750
| | | | | | | | | | | | (cherry picked from commit d963b52229e2d1a3875698e5d2822f00df3485c9) Change-Id: I249fafe24795b94294c9f9251713c1028a3d9199
| * Prevent new install of tools from displaying update msg. Do not merge.Raphael2011-09-2410-30/+97
| | | | | | | | | | | | (cherry picked from commit 2a94ac98f9079e083ca88037b38244b5b5a46d7f) Change-Id: Iee30e19c591cb375104fbcbeb3474c52a47df465
| * First time install: multiple platforms, fix shell disposed. Do not merge.Raphael2011-09-245-113/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes for the first time install support: - Support installing more than one platform. The custom install task was tailored before to one install a single package and return one status with on archive install path. This has been made more generic. - Fix a couple occurences of the dreaded "SWT Shell disposed" error that happen when updating the progress bar and closing the window at the same time. The issue is that I was checking isDisposed before starting a syncExec but the window can be closed between the moment the syncExec is schedule and when it happens so code must check again for isDisposed inside the syncExec. (cherry picked from commit 949dc34d6202ec5e318c30992bc11b61e0c64808) Change-Id: I08976f2fcbba68f5371e410ffe8c741c1fa2c2dd
| * Merge "Address some comments on the DdmsPreferenceStore. Do not merge." into ↵Raphael2011-09-242-2/+2
| |\ | | | | | | | | | tools_r14
| | * Address some comments on the DdmsPreferenceStore. Do not merge.Raphael2011-09-232-2/+2
| | | | | | | | | | | | | | | | | | (cherry picked from commit 23e2f89139a9219136f5889ef1228b58bd9e02d6) Change-Id: I65d7bed7a044d31376f592c7dcd9713a4b00262c
| * | Merge "Tweak AdtUpdater dialog to install a fresh new SDK. Do not merge." ↵Raphael2011-09-242-41/+125
| |\ \ | | |/ | | | | | | into tools_r14
| | * Tweak AdtUpdater dialog to install a fresh new SDK. Do not merge.Raphael2011-09-232-41/+125
| | | | | | | | | | | | | | | | | | (cherry picked from commit 4366a4e8145df82dd570d0c9f2b1c3c4301166a1) Change-Id: I23f4504a5239592db211d5436c252b957ba68503
| * | Merge b927e75 from master. do not merge.Xavier Ducrohet2011-09-231-14/+14
| |/ | | | | | | | | | | | | | | | | | | | | | | When creating AVDs, check ABI before prompting for hw config. The check verifies the number of available ABIs and the presence of the --abi option (required if 2+ ABIs). This avoid going through all the hardware config to then get an error because --abi is missing. Change-Id: I1c69dec3f2262e5faa8ce8a2d53d01fcafe8a20d
| * CherryPick a9a282 from master. do not merge.Xavier Ducrohet2011-09-232-19/+79
| | | | | | | | | | | | Add dependency support for ApkBuilder ant step. Change-Id: Ia51f745f3bb0a91bafe0396804b999a0e39578ea