aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Create MonkeyRunner docs target to generate SDK docs."Xavier Ducrohet2010-08-251-0/+15
|\
| * Create MonkeyRunner docs target to generate SDK docs.Bill Napier2010-08-191-0/+15
| | | | | | | | Change-Id: Id84e1aec8965ac0efc58c25234855960e826fb3b
* | Merge "DOC: Updated doc for MonkeyRunner API"Xavier Ducrohet2010-08-253-113/+157
|\ \
| * | DOC: Updated doc for MonkeyRunner APIJoe Malin2010-08-163-113/+157
| | | | | | | | | | | | Change-Id: Id2682f2922a5ca509211a0c18c9c1366f0b020dc
* | | Merge "sdk-docs output format for use in generating the SDK documentation ↵Bill Napier2010-08-253-2/+30
|\ \ \ | | | | | | | | | | | | for MonkeyRunner."
| * | | sdk-docs output format for use in generating the SDK documentation for ↵Bill Napier2010-08-193-2/+30
| | |/ | |/| | | | | | | | | | | | | MonkeyRunner. Change-Id: Iaf8cb5273d025983e62cca6ab092dca9e97c331a
* | | Merge "Allow adt-tests to access package-private elements."Brett Chabot2010-08-235-92/+16
|\ \ \
| * | | Allow adt-tests to access package-private elements.Brett Chabot2010-08-215-92/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously when running tests in the continuous tests system, adt-tests could not access any package-private elements in adt. This was because adt-tests was a separate plugin and thus had a separate class loader. With this commit, adt-tests is now a fragment, and its code runs inside the adt plugin. Bug 2179353 Change-Id: Iec8c08bed2fa116b38490a774cd3bd6f4c7358a5
* | | | merge from tools_r7The Android Open Source Project2010-08-230-0/+0
|\ \ \ \ | | | | | | | | | | | | | | | Change-Id: Ib8fa2647481d2d61d9bea2d5cd30fb0207e1dcf3
| * \ \ \ Merge "SDK Launcher: add win32 app manifest" into tools_r7Xavier Ducrohet2010-08-234-9/+42
| |\ \ \ \
| | * | | | SDK Launcher: add win32 app manifestRaphael Moll2010-08-234-9/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merged from master to tools_r7 Change-Id: Ic9b8d265868b0e062fce067312c9e9fa89bba3c7
| * | | | | Merge "SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"" into tools_r7Xavier Ducrohet2010-08-232-6/+12
| |\ \ \ \ \
| | * | | | | SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"Raphael Moll2010-08-232-6/+12
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merged from master to tools_r7 Change-Id: Ib8e702344dd2d593d7f7e6d56b0c3534480ff376
* | | | | | merge from tools_r7The Android Open Source Project2010-08-230-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: I36f9cb801e3dfe6338f503c49e3380d565214be3
| * | | | | Improve capability of the post-compile target.Xavier Ducrohet2010-08-232-1/+6
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the dex target use a different property to read the input folder for classes to dexify. By default the new property has the same value but can be overriden if a post-compile target modify (obfuscate) code into a different location. Merged from master into tools_r7 Change-Id: I1fe2fd2a2678d8c4354702250cea1481f74dd7cf
* | | | | Merge "Improve capability of the post-compile target."Xavier Ducrohet2010-08-232-1/+6
|\ \ \ \ \
| * | | | | Improve capability of the post-compile target.Xavier Ducrohet2010-08-232-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the dex target use a different property to read the input folder for classes to dexify. By default the new property has the same value but can be overriden if a post-compile target modify (obfuscate) code into a different location. Change-Id: I9caeca9f342c7ead1dcee9b4d80cde4ad741a843
* | | | | | Merge "SDK: Rename "SDK Setup.exe" to "SDK Manager.exe""Raphael Moll2010-08-232-6/+12
|\ \ \ \ \ \
| * | | | | | SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"Raphael Moll2010-08-232-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id62b59e75e92fe14376353211dd59d89f4ee63c6
* | | | | | | Merge "SDK Launcher: add win32 app manifest"Raphael Moll2010-08-234-9/+42
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | |
| * | | | | SDK Launcher: add win32 app manifestRaphael Moll2010-08-214-9/+42
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iac3ad3d28d62c67b15b75346a56c2194f1837096
* | | | | | Merge "Fix error strings: it's "dx.jar", not "dex.jar""Raphael Moll2010-08-233-25/+25
|\ \ \ \ \ \
| * | | | | | Fix error strings: it's "dx.jar", not "dex.jar"Raphael Moll2010-08-213-25/+25
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The error message has the wrong file name and that confused me when I manually created my platform-tools. Change-Id: I2d1b5258db99c5359c0ebe71d42b2d93558941ac
* | | | | | merge from tools_r7The Android Open Source Project2010-08-230-0/+0
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | Change-Id: I1c48422d1732d53527d7afae6c30c285bee54146
| * | | | | Android.bat support for Java 64-bit.Raphael Moll2010-08-232-89/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android.bat: properly encode file using CRLF (not Unix mode). find_java.bat: properly check for Java in the 64-bit ProgramFiles path. Change-Id: If4a106f144b5b890a62fc5543b35df85ab5ab06c
* | | | | | Merge "Android.bat support for Java 64-bit."Raphael Moll2010-08-232-89/+97
|\ \ \ \ \ \
| * | | | | | Android.bat support for Java 64-bit.Raphael Moll2010-08-212-89/+97
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android.bat: properly encode file using CRLF (not Unix mode). find_java.bat: properly check for Java in the 64-bit ProgramFiles path. Change-Id: I78adb4783955cfad867d29f66d7ee58a017d41c4
* | | | | | Disable tests using EasyMock to fix build.Raphael Moll2010-08-211-30/+28
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | We'll try to fix it in another CL later. Change-Id: I3a0c5131e6e9398a657081a639fbfd6aa670ba97
* | | | | Merge changes Ie49a141a,I71c6f4b6Raphael Moll2010-08-2111-62/+317
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: UnitTest for UpdaterLogic.findPlatformToolsDependency. SDK Manager support for Platform-Tools
| * | | | | UnitTest for UpdaterLogic.findPlatformToolsDependency.Raphael Moll2010-08-193-8/+122
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie49a141ad0d25021164166aeb4405877045719bf
| * | | | | SDK Manager support for Platform-ToolsRaphael Moll2010-08-198-54/+195
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: - Fixed dependency (PlatformToolPackage was made to depend on itself... oops it should have been ToolPackage!) - Load platform-tool from XML. - Specify sorting order of platform-tool in list. - Compute a platform-tool has a dependency for tool package. - Added a totally impressive icon for the new platform-tool package. - Update the schema comments to explicitely indicate what is new. Change-Id: I71c6f4b61028990d051a479b919a7f55a79f87cf
* | | | | Merge "ADT GLE unit tests."Raphael Moll2010-08-213-7/+85
|\ \ \ \ \
| * | | | | ADT GLE unit tests.Raphael Moll2010-08-193-7/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There isn't as much as would want to here. I need to refactor the RulesEngine to make it more testable, the major block is that it uses the static AdtPlugin to find the groovy files path and that doesn't exist in the UT. Change-Id: I96c0821252d5b777665ed68153fde63d140d0ee5
* | | | | | Merge "Force disconnect of all devices when adb connection is lost."Brett Chabot2010-08-201-0/+14
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Force disconnect of all devices when adb connection is lost.Brett Chabot2010-08-121-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 2873317 Change-Id: Idc56be6dbd8912ee463295ddfe6f3b0bbf0b5125
* | | | | | merge from tools_r7The Android Open Source Project2010-08-200-0/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | | Change-Id: I0a73800c5f6454a012d6556668aa98ddfb53db3a
| * | | | Merge sdklib manifest fix for r7. DO NOT MERGE.Xavier Ducrohet2010-08-202-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original commit msg: Fix missing dependency in the sdklib manifest + improved error reporting. Change-Id: I778a839cc280db8bcc7a4a0b11378119de9aed57
* | | | | Merge "Transition from clearsilver to jsilver"Ben Dodson2010-08-192-28/+20
|\ \ \ \ \
| * | | | | Transition from clearsilver to jsilverBen Dodson2010-08-192-28/+20
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iea2fb85b246685b1c2e27866bb1c1df80fa55abe
* | | | | | Merge "Adding property and profile viewers + misc"Konstantin Lopyrev2010-08-1912-44/+664
|\ \ \ \ \ \
| * | | | | | Adding property and profile viewers + miscKonstantin Lopyrev2010-08-1712-44/+664
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I04b7e6045047d303b3434dc64662ffeb36c48c24
* | | | | | | Merge "Increasing the changes of a device connecting properly and making ↵Konstantin Lopyrev2010-08-199-62/+116
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | sure things are disposed of properly."
| * | | | | | Increasing the changes of a device connecting properly and making sure ↵Konstantin Lopyrev2010-08-179-62/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | things are disposed of properly. Change-Id: Ib1190c65c8ac9795fc0b97beacd7fd102cb95abf
* | | | | | | Merge "Adding the new tree view."Konstantin Lopyrev2010-08-1916-100/+1293
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Adding the new tree view.Konstantin Lopyrev2010-08-1716-100/+1293
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I490f475fadaec5625352a49524ec8cb3a6e9b7d4
* | | | | | | Merge "Adding pixel perfect view, loupe and tree."Konstantin Lopyrev2010-08-1911-14/+1358
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Adding pixel perfect view, loupe and tree.Konstantin Lopyrev2010-08-1711-14/+1358
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9be3e9037dec5eeb240608ba8c6329fd77689bbe
* | | | | | | Merge "ADT-Tests: Unit test for GRE NodeFactory."Raphael Moll2010-08-194-4/+187
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | ADT-Tests: Unit test for GRE NodeFactory.Raphael Moll2010-08-164-4/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I33039b0be05f0eca51f1fd5c6f616d01f46a59b7
* | | | | | | Merge "Fix missing dependency in the sdklib manifest + improved error ↵Xavier Ducrohet2010-08-192-5/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | reporting."
generated by cgit v1.1 at 2025-01-26 04:15:49 +0000