OSDN Git Service
The Android Open Source Project [Mon, 30 Aug 2010 23:07:39 +0000 (16:07 -0700)]
merge from open-source master
Change-Id: I97ab7062e558756b01eddbdcb058b4e451b7722d
Xavier Ducrohet [Mon, 30 Aug 2010 22:58:18 +0000 (15:58 -0700)]
Fix ddmlib's classpath to not copy Android.mk
With the recent change to build all folders under the root folder,
there was an issue with Eclipse copying src/Android.mk into the bin
folder. This prevented the sdk from building locally due to duplicate
module names.
Change-Id: I541d5198cb3501a55b7072fc3c6a8b58178e9661
The Android Open Source Project [Sat, 28 Aug 2010 22:45:46 +0000 (15:45 -0700)]
merge from open-source master
Change-Id: I0282cd5fd5cabb0e2199a4236ea916eb7f685471
Raphael Moll [Sat, 28 Aug 2010 22:43:12 +0000 (15:43 -0700)]
Merge "Fix Eclipse build: also build hierarchyviewer plugin."
Raphael Moll [Sat, 28 Aug 2010 22:38:15 +0000 (15:38 -0700)]
Fix Eclipse build: also build hierarchyviewer plugin.
Needs to be build on the build server since ADT depends on it.
Change-Id: I6fe6a2ab00428f25e8b3e4595ea8b81bce94454d
Raphael Moll [Sat, 28 Aug 2010 22:36:34 +0000 (15:36 -0700)]
Fix Eclipse build.
Provides dummy implementations of the new testEnded() method.
Change-Id: Iaa9183e0fe89d162572ab2c77c9ba1b23c14a41c
The Android Open Source Project [Sat, 28 Aug 2010 21:38:58 +0000 (14:38 -0700)]
merge from open-source master
Change-Id: I52a4888b6495c2797edecd27ce3b35c49efc171a
Raphael Moll [Sat, 28 Aug 2010 21:36:54 +0000 (14:36 -0700)]
Merge "ADT: new action to run dexdump on project."
The Android Open Source Project [Sat, 28 Aug 2010 04:52:49 +0000 (21:52 -0700)]
merge from open-source master
Change-Id: I12368ceb0d512ddf57d2b90c91de0a846230fe40
Raphael Moll [Sat, 28 Aug 2010 04:42:56 +0000 (21:42 -0700)]
Merge "ADT: Make GLE2 the default."
The Android Open Source Project [Sat, 28 Aug 2010 03:56:56 +0000 (20:56 -0700)]
merge from open-source master
Change-Id: I7bf17eca20569571fe1339e49df7f9ab6e2838bf
Omari Stephens [Sat, 7 Aug 2010 02:46:00 +0000 (19:46 -0700)]
Write tests for the new ITestRunListener API method
Change-Id: Ieea11742ae23cc30296fcc1cfe477d9814fa4a4e
Omari Stephens [Sat, 7 Aug 2010 02:43:52 +0000 (19:43 -0700)]
Fix the ddmlib makefiles to compile tests properly
Change-Id: Id5012098dccbd264890251fdff57b91ca3ae1b85
Omari Stephens [Fri, 6 Aug 2010 03:10:18 +0000 (20:10 -0700)]
Store and report metrics emitted during each test case
Change-Id: Ia7e7f6bef73e7ecd30b03973fd966d28ac90464b
The Android Open Source Project [Sat, 28 Aug 2010 02:14:41 +0000 (19:14 -0700)]
merge from open-source master
Change-Id: I45a9ed955c76132d3bf955192686a28ce3c152b1
Konstantin Lopyrev [Sat, 28 Aug 2010 02:05:05 +0000 (19:05 -0700)]
Merge "Adding a smaller timeout to capturing nodes. This is so that it doesn't get stuck."
Konstantin Lopyrev [Sat, 28 Aug 2010 02:02:42 +0000 (19:02 -0700)]
Adding a smaller timeout to capturing nodes. This is so that it doesn't get stuck.
Change-Id: Ie2fd89d74a2a044334b45ba050f2c3150f63a8e7
The Android Open Source Project [Sat, 28 Aug 2010 01:52:20 +0000 (18:52 -0700)]
merge from open-source master
Change-Id: I404970833addc17510cb4ef19ccd15135e95016f
Xavier Ducrohet [Sat, 28 Aug 2010 01:40:32 +0000 (18:40 -0700)]
Recompute feature dependencies.
Change-Id: I22afafe283cd2e114f4d3b84687adcd18c17d784
Xavier Ducrohet [Sat, 28 Aug 2010 01:32:57 +0000 (18:32 -0700)]
Misc fix in HierarchyViewer plugin.
- Add plug-in to the update sites
- Remove ddm(ui)lib from the plugin as it accesses the ddms plug-in
Change-Id: I524180688443e0a72443a04fc3f00300e8ddc165
The Android Open Source Project [Sat, 28 Aug 2010 01:28:56 +0000 (18:28 -0700)]
merge from open-source master
Change-Id: I6a89b5d4a4020c13d077999b92381e3bd084a79d
The Android Open Source Project [Sat, 28 Aug 2010 01:17:21 +0000 (18:17 -0700)]
merge from open-source master
Change-Id: I40dc72513bf54320e05d180a6f5e0adb4417c074
Konstantin Lopyrev [Sat, 28 Aug 2010 01:16:28 +0000 (18:16 -0700)]
Fix broken plug-in
Change-Id: I8a6c8bd4b3d5ce0d7bcda5154c0187c256ab3db9
Konstantin Lopyrev [Sat, 28 Aug 2010 00:55:52 +0000 (17:55 -0700)]
Renaming and adding //$NON-NLS-?$
Change-Id: I9f5fa1625af4b35499cfc87996d0b3a39841ba31
The Android Open Source Project [Sat, 28 Aug 2010 00:06:33 +0000 (17:06 -0700)]
merge from open-source master
Change-Id: Ifa20cdcd375572a81e3c1232994c1ea31840dc60
Xavier Ducrohet [Sat, 28 Aug 2010 00:00:56 +0000 (17:00 -0700)]
Merge "NPE in FolderDecorater"
The Android Open Source Project [Fri, 27 Aug 2010 23:54:51 +0000 (16:54 -0700)]
merge from open-source master
Change-Id: Ica4bcf2e5abd8edbdf22cf7f65ff9b266a848b37
The Android Open Source Project [Fri, 27 Aug 2010 23:31:18 +0000 (16:31 -0700)]
merge from open-source master
Change-Id: Ic5cdf6e161d8c370c4f4bac5bbd726d5f3206d33
Konstantin Lopyrev [Fri, 27 Aug 2010 16:08:34 +0000 (09:08 -0700)]
Refactoring and integrating into Eclipse
Change-Id: I1fd3c3828fb2474f2f7394ee2831fcd7eb675878
Konstantin Lopyrev [Thu, 26 Aug 2010 00:46:57 +0000 (17:46 -0700)]
Making the profiling box slightly transparent
Change-Id: I886a8b1c61db11d521657ec776152b07e7f9fabb
Konstantin Lopyrev [Fri, 27 Aug 2010 23:20:11 +0000 (16:20 -0700)]
Merge "Bug fixes and reducing timeout."
Konstantin Lopyrev [Fri, 27 Aug 2010 23:20:04 +0000 (16:20 -0700)]
Merge "Renaming"
Konstantin Lopyrev [Fri, 27 Aug 2010 23:19:59 +0000 (16:19 -0700)]
Merge "Commentary, getting rid of bad about image, and some clean-up."
Konstantin Lopyrev [Fri, 27 Aug 2010 23:19:50 +0000 (16:19 -0700)]
Merge "Making the profiling stuff appear in a cool place."
Konstantin Lopyrev [Fri, 27 Aug 2010 23:19:43 +0000 (16:19 -0700)]
Merge "Creating the application"
Konstantin Lopyrev [Fri, 27 Aug 2010 23:19:35 +0000 (16:19 -0700)]
Merge "Tweaking and moving."
The Android Open Source Project [Fri, 27 Aug 2010 22:55:43 +0000 (15:55 -0700)]
merge from open-source master
Change-Id: Ib43df7c49df2374d3c28fd627eec63b31e2f46c1
Andy McFadden [Fri, 27 Aug 2010 22:48:04 +0000 (15:48 -0700)]
Merge "Add "suspended" state to thread display."
Konstantin Lopyrev [Wed, 25 Aug 2010 20:24:17 +0000 (13:24 -0700)]
Bug fixes and reducing timeout.
Change-Id: Ibfa23734679d0337aa7f6e250a621026b13a70f0
Konstantin Lopyrev [Wed, 25 Aug 2010 19:28:47 +0000 (12:28 -0700)]
Renaming
Change-Id: I10c8b1cf1be3b66fe0b7527ffb72501d8d61ebb3
Konstantin Lopyrev [Wed, 25 Aug 2010 19:17:49 +0000 (12:17 -0700)]
Commentary, getting rid of bad about image, and some clean-up.
Change-Id: I9dad056de8e7e208f156bbedbced47dd49b61fcb
Konstantin Lopyrev [Wed, 25 Aug 2010 06:06:45 +0000 (23:06 -0700)]
Making the profiling stuff appear in a cool place.
Change-Id: Id28e1a2a01ec88210a7024e2ad115131c9e4d34e
Konstantin Lopyrev [Thu, 19 Aug 2010 05:08:09 +0000 (22:08 -0700)]
Creating the application
Change-Id: I8f2fce7328cc1d93caed1cf003f04e41204f864c
Konstantin Lopyrev [Wed, 18 Aug 2010 01:00:33 +0000 (18:00 -0700)]
Tweaking and moving.
Change-Id: I9906268a91c53c7b9e938b9c969cedeae2a4303a
The Android Open Source Project [Thu, 26 Aug 2010 21:43:44 +0000 (14:43 -0700)]
merge from open-source master
Change-Id: I08828e6777351e619b0de413924931b8c7c6f418
Omari Stephens [Thu, 26 Aug 2010 21:32:29 +0000 (14:32 -0700)]
Merge "Fix permissions: source files shouldn't be executable"
Raphael Moll [Thu, 26 Aug 2010 05:06:04 +0000 (22:06 -0700)]
ADT: Make GLE2 the default.
Export USE_GLE1 to something != 0 to force GLE1.
Change-Id: I525bc276f3ad096d6ae64508f4c9808f52684b02
Omari Stephens [Fri, 6 Aug 2010 01:37:52 +0000 (18:37 -0700)]
Fix permissions: source files shouldn't be executable
Change-Id: I4030ca07fb40e171978d8eb366b6d403e3c9ea2c
The Android Open Source Project [Wed, 25 Aug 2010 22:56:41 +0000 (15:56 -0700)]
merge from open-source master
Change-Id: I734d1d07fbf4b9e58b384e32dcfac72cb5bd0cfb
Xavier Ducrohet [Wed, 25 Aug 2010 22:48:04 +0000 (15:48 -0700)]
Merge "Create MonkeyRunner docs target to generate SDK docs."
Xavier Ducrohet [Wed, 25 Aug 2010 22:46:44 +0000 (15:46 -0700)]
Merge "DOC: Updated doc for MonkeyRunner API"
The Android Open Source Project [Wed, 25 Aug 2010 19:04:48 +0000 (12:04 -0700)]
merge from open-source master
Change-Id: I2221a668ad1a63280148588b21fe9f2b64ce013f
Bill Napier [Wed, 25 Aug 2010 17:30:38 +0000 (10:30 -0700)]
Merge "sdk-docs output format for use in generating the SDK documentation for MonkeyRunner."
Andy McFadden [Wed, 25 Aug 2010 17:05:33 +0000 (10:05 -0700)]
Add "suspended" state to thread display.
Change-Id: Id13f96d1e490228a2fc9a7452a34cd4ac7e5aa46
Raphael Moll [Wed, 25 Aug 2010 01:57:03 +0000 (18:57 -0700)]
ADT: new action to run dexdump on project.
Captures the dexdump in a temp file and opens it in an editor.
Change-Id: I6363e788fb80b3b602e3d0d736deb8888f8d9b42
The Android Open Source Project [Tue, 24 Aug 2010 04:44:11 +0000 (21:44 -0700)]
merge from open-source master
Change-Id: Ic946a039fe4a5021549fe87bf2cbd11aa045ce39
Brett Chabot [Tue, 24 Aug 2010 04:37:48 +0000 (21:37 -0700)]
Merge "Allow adt-tests to access package-private elements."
The Android Open Source Project [Mon, 23 Aug 2010 22:36:40 +0000 (15:36 -0700)]
merge from open-source master
Change-Id: I3d83bcd8c99e2e91097bcff391a8bd574ac81344
The Android Open Source Project [Mon, 23 Aug 2010 22:25:09 +0000 (15:25 -0700)]
merge from tools_r7
Change-Id: Ib8fa2647481d2d61d9bea2d5cd30fb0207e1dcf3
The Android Open Source Project [Mon, 23 Aug 2010 22:25:00 +0000 (15:25 -0700)]
merge from open-source master
Change-Id: I215cd89ec845a094137ace2e361aa76c5050e542
Xavier Ducrohet [Mon, 23 Aug 2010 22:14:24 +0000 (15:14 -0700)]
Merge "SDK Launcher: add win32 app manifest" into tools_r7
Raphael Moll [Sun, 22 Aug 2010 00:59:12 +0000 (17:59 -0700)]
SDK Launcher: add win32 app manifest
Merged from master to tools_r7
Change-Id: Ic9b8d265868b0e062fce067312c9e9fa89bba3c7
Xavier Ducrohet [Mon, 23 Aug 2010 22:13:28 +0000 (15:13 -0700)]
Merge "SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"" into tools_r7
The Android Open Source Project [Mon, 23 Aug 2010 22:13:20 +0000 (15:13 -0700)]
merge from tools_r7
Change-Id: I36f9cb801e3dfe6338f503c49e3380d565214be3
The Android Open Source Project [Mon, 23 Aug 2010 22:13:00 +0000 (15:13 -0700)]
merge from open-source master
Change-Id: Ia55cfd4c49a26447d06124b4505eeff73e5998e1
Raphael Moll [Sun, 22 Aug 2010 01:03:49 +0000 (18:03 -0700)]
SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
Merged from master to tools_r7
Change-Id: Ib8e702344dd2d593d7f7e6d56b0c3534480ff376
Xavier Ducrohet [Mon, 23 Aug 2010 21:42:33 +0000 (14:42 -0700)]
Improve capability of the post-compile target.
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
Xavier Ducrohet [Mon, 23 Aug 2010 22:06:40 +0000 (15:06 -0700)]
Merge "Improve capability of the post-compile target."
Xavier Ducrohet [Mon, 23 Aug 2010 21:42:33 +0000 (14:42 -0700)]
Improve capability of the post-compile target.
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
The Android Open Source Project [Mon, 23 Aug 2010 21:12:07 +0000 (14:12 -0700)]
merge from open-source master
Change-Id: Iaf2f7de891f78af2eddd7a5edc6e8d5bcc4e0b48
Raphael Moll [Mon, 23 Aug 2010 21:01:32 +0000 (14:01 -0700)]
Merge "SDK: Rename "SDK Setup.exe" to "SDK Manager.exe""
Raphael Moll [Mon, 23 Aug 2010 21:01:24 +0000 (14:01 -0700)]
Merge "SDK Launcher: add win32 app manifest"
Raphael Moll [Sun, 22 Aug 2010 01:03:49 +0000 (18:03 -0700)]
SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
Change-Id: Id62b59e75e92fe14376353211dd59d89f4ee63c6
The Android Open Source Project [Mon, 23 Aug 2010 20:21:03 +0000 (13:21 -0700)]
merge from open-source master
Change-Id: I0ef9172d9b16df4227c9e6ed6705d9ba699ace61
Raphael Moll [Mon, 23 Aug 2010 20:11:14 +0000 (13:11 -0700)]
Merge "Fix error strings: it's "dx.jar", not "dex.jar""
The Android Open Source Project [Mon, 23 Aug 2010 20:05:56 +0000 (13:05 -0700)]
merge from tools_r7
Change-Id: I1c48422d1732d53527d7afae6c30c285bee54146
The Android Open Source Project [Mon, 23 Aug 2010 19:53:17 +0000 (12:53 -0700)]
merge from open-source master
Change-Id: I01a81355942ab0a11c257fd4ffa11b6db2e71e8e
Raphael Moll [Sat, 21 Aug 2010 04:54:59 +0000 (21:54 -0700)]
Android.bat support for Java 64-bit.
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
Raphael Moll [Mon, 23 Aug 2010 19:42:23 +0000 (12:42 -0700)]
Merge "Android.bat support for Java 64-bit."
snpe [Wed, 18 Aug 2010 19:24:41 +0000 (21:24 +0200)]
NPE in FolderDecorater
Change-Id: Ica70dedb0b86ab877337d001aac6a205b15a60c0
Raphael Moll [Sun, 22 Aug 2010 00:59:12 +0000 (17:59 -0700)]
SDK Launcher: add win32 app manifest
Change-Id: Iac3ad3d28d62c67b15b75346a56c2194f1837096
Brett Chabot [Sat, 21 Aug 2010 02:22:49 +0000 (19:22 -0700)]
Allow adt-tests to access package-private elements.
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
Raphael Moll [Sat, 21 Aug 2010 19:43:31 +0000 (12:43 -0700)]
Fix error strings: it's "dx.jar", not "dex.jar"
The error message has the wrong file name and that
confused me when I manually created my platform-tools.
Change-Id: I2d1b5258db99c5359c0ebe71d42b2d93558941ac
The Android Open Source Project [Sat, 21 Aug 2010 19:23:51 +0000 (12:23 -0700)]
merge from open-source master
Change-Id: I64e1967ebe526292fb445f3a63eee6341f71d309
Raphael Moll [Sat, 21 Aug 2010 19:17:03 +0000 (12:17 -0700)]
Disable tests using EasyMock to fix build.
We'll try to fix it in another CL later.
Change-Id: I3a0c5131e6e9398a657081a639fbfd6aa670ba97
Raphael Moll [Sat, 21 Aug 2010 04:54:59 +0000 (21:54 -0700)]
Android.bat support for Java 64-bit.
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
The Android Open Source Project [Sat, 21 Aug 2010 18:27:20 +0000 (11:27 -0700)]
merge from open-source master
Change-Id: I9d22b5e33b228b6b54234387356bc592bfb51bb8
Raphael Moll [Sat, 21 Aug 2010 18:05:37 +0000 (11:05 -0700)]
Merge changes Ie49a141a,I71c6f4b6
* changes:
UnitTest for UpdaterLogic.findPlatformToolsDependency.
SDK Manager support for Platform-Tools
The Android Open Source Project [Sat, 21 Aug 2010 18:05:05 +0000 (11:05 -0700)]
merge from open-source master
Change-Id: I96aa9ed93ba47b0e28f73bdf3b10119a181f633e
Raphael Moll [Sat, 21 Aug 2010 18:01:30 +0000 (11:01 -0700)]
Merge "ADT GLE unit tests."
The Android Open Source Project [Sat, 21 Aug 2010 00:11:05 +0000 (17:11 -0700)]
merge from open-source master
Change-Id: I3c7e9f4b3b1af8b39d1d0e3dba1ad3fc6d9033c0
Brett Chabot [Sat, 21 Aug 2010 00:01:21 +0000 (17:01 -0700)]
Merge "Force disconnect of all devices when adb connection is lost."
The Android Open Source Project [Fri, 20 Aug 2010 18:02:25 +0000 (11:02 -0700)]
merge from open-source master
Change-Id: I96edec07df6843984515ff92d3636434397a9d7e
The Android Open Source Project [Fri, 20 Aug 2010 17:51:08 +0000 (10:51 -0700)]
merge from tools_r7
Change-Id: I0a73800c5f6454a012d6556668aa98ddfb53db3a
Xavier Ducrohet [Wed, 18 Aug 2010 18:54:31 +0000 (11:54 -0700)]
Merge sdklib manifest fix for r7. DO NOT MERGE.
Original commit msg:
Fix missing dependency in the sdklib manifest + improved error reporting.
Change-Id: I778a839cc280db8bcc7a4a0b11378119de9aed57
Bill Napier [Fri, 20 Aug 2010 05:47:36 +0000 (22:47 -0700)]
Create MonkeyRunner docs target to generate SDK docs.
Change-Id: Id84e1aec8965ac0efc58c25234855960e826fb3b
Bill Napier [Fri, 20 Aug 2010 05:46:43 +0000 (22:46 -0700)]
sdk-docs output format for use in generating the SDK documentation for MonkeyRunner.
Change-Id: Iaf8cb5273d025983e62cca6ab092dca9e97c331a
Raphael Moll [Fri, 20 Aug 2010 03:56:26 +0000 (20:56 -0700)]
UnitTest for UpdaterLogic.findPlatformToolsDependency.
Change-Id: Ie49a141ad0d25021164166aeb4405877045719bf
Raphael Moll [Thu, 19 Aug 2010 23:55:17 +0000 (16:55 -0700)]
SDK Manager support for Platform-Tools
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
The Android Open Source Project [Thu, 19 Aug 2010 22:35:31 +0000 (15:35 -0700)]
merge from open-source master
Change-Id: I86b16a803691187dc9311509042bcca68a2a9ac1
OSDN Git Service
