OSDN Git Service

android-x86/sdk.git
13 years agoADT: Make release and debug builds really different.
Xavier Ducrohet [Tue, 31 Aug 2010 17:21:29 +0000 (10:21 -0700)]
ADT: Make release and debug builds really different.

Release export should not be debug builds that are
stripped of their signature and (optionnaly) resigned.
Instead they should actually build the apk in "release"
mode.

Refactor PostCompilerHelper to be easier to use for
export feature (moved all error handling into the
actual IncrementalBuilder since we don't want the
helper to put error/warning marker during release
export).

Update the API of ApkBuilder and PostCompilerHelper
to deal better with signing key:
- option to package with a "sign with debug" flag.
- new option to package/sign with given keys.

Debug build (through incremental builder) use the new
aapt option --debug-mode that automatically insert
debuggable=true in the manifest. This allows for the
same source code to generate debug and release builds.

Currently, only the "export unsigned release apk"
action use the new "release" build. Need to update
the export wizard. Also need to add support for this
in Ant.

New folder in sdk.git/testapps for test projects
to be used in upcoming automated build tests.
Simple "basicProject" to start with.

Change-Id: I3041312bc817153603656de2aa355f8fcaf00b5b

13 years agoMerge "Previous commit lacked this change to hierarchyviewer."
Xavier Ducrohet [Wed, 1 Sep 2010 23:45:43 +0000 (16:45 -0700)]
Merge "Previous commit lacked this change to hierarchyviewer."

13 years agoPrevious commit lacked this change to hierarchyviewer.
Xavier Ducrohet [Wed, 1 Sep 2010 23:44:19 +0000 (16:44 -0700)]
Previous commit lacked this change to hierarchyviewer.

This is meant to be part of the fix for MacOs X.

Change-Id: Ic2090cd7806f4ae7801851aa0b3f9b8975f150af

13 years agoMerge changes I682ba19d,Ie7451c21
Raphael Moll [Wed, 1 Sep 2010 23:34:51 +0000 (16:34 -0700)]
Merge changes I682ba19d,Ie7451c21

* changes:
  GLE2 context menu: Handle boolean properties as tri-state.
  GLE2 context menu support.

13 years agoGLE2 context menu: Handle boolean properties as tri-state.
Raphael Moll [Wed, 1 Sep 2010 22:32:22 +0000 (15:32 -0700)]
GLE2 context menu: Handle boolean properties as tri-state.

Also offer a clear option for enums and flags.

Change-Id: I682ba19d9f5a1c1d5da28909b02a90ec01f4fc62

13 years agomerge from tools_r7
The Android Open Source Project [Wed, 1 Sep 2010 13:18:44 +0000 (06:18 -0700)]
merge from tools_r7

Change-Id: I061d6122963907a348ec592bd08077df302413e2

13 years agoRevert "Fixed problem with keymap files copied to target"
Jean-Baptiste Queru [Wed, 1 Sep 2010 13:16:36 +0000 (06:16 -0700)]
Revert "Fixed problem with keymap files copied to target"

This reverts commit 1fc95cae8ec2ccfe134ff279ed9082311ad0d877.

13 years agoRevert "Fixed problem with keymap files copied to target"
Jean-Baptiste Queru [Wed, 1 Sep 2010 13:11:12 +0000 (06:11 -0700)]
Revert "Fixed problem with keymap files copied to target"

This reverts commit 246e0ee6968ed0030fe99cc12ca154a1513b8645.

13 years agoMerge "Fix HierarchyViewer2 to run on MacOS X correctly."
Xavier Ducrohet [Wed, 1 Sep 2010 02:22:38 +0000 (19:22 -0700)]
Merge "Fix HierarchyViewer2 to run on MacOS X correctly."

13 years agoFix HierarchyViewer2 to run on MacOS X correctly.
Xavier Ducrohet [Wed, 1 Sep 2010 00:50:58 +0000 (17:50 -0700)]
Fix HierarchyViewer2 to run on MacOS X correctly.

This also fix the issue with the app never closing correctly
(throwing an exception).

Also updated the launcher script to match the new ones we use in
the other Java based tools.

Change-Id: I851f0732a78c6e6c072728f05e611f01eee8fc19

13 years agoGLE2 context menu support.
Raphael Moll [Fri, 27 Aug 2010 07:02:30 +0000 (00:02 -0700)]
GLE2 context menu support.

Context menu now shows some view properties:
- for all views, quick access to layout width/height.
- for LinearLayout, quick access to orientation.
- for all views, quick access to all boolean, enum or flag attributes.

Some follow up will be necessary in another CL, namely:
- booleans must be tri-states (true, false, cleared).
- need a way to clear enum and flags rather than just change the value.

Change-Id: Ie7451c21f0781f0efb0a1bbc676abef80027c4f7

13 years agomerge from tools_r7
The Android Open Source Project [Wed, 1 Sep 2010 00:34:21 +0000 (17:34 -0700)]
merge from tools_r7

Change-Id: I9de1ce4221adea247a5f6afe958e2a2e67332034

13 years agoFixed problem with keymap files copied to target
Magnus Karlsson [Mon, 30 Aug 2010 14:54:03 +0000 (16:54 +0200)]
Fixed problem with keymap files copied to target

Moved Android.mk and keymap files except AVRCP.kl from sdk/emulator/keymaps
to build/target/board/generic. This causes the keymap files to copied into
the system image of generic and sdk products, but not into the system image
of HW products. Originally the qwerty.kl was copied to target no matter
if the target had a qwerty keyboard or not, which is the case for e.g.
the Nexus One.

Change-Id: I6f76bcd4e23b8478f36f213090d22d7d3ea1255b

13 years agoMerge "Fixed problem with keymap files copied to target"
Jean-Baptiste Queru [Tue, 31 Aug 2010 21:52:59 +0000 (14:52 -0700)]
Merge "Fixed problem with keymap files copied to target"

13 years agoresolve conflict from tools_r7
Jean-Baptiste Queru [Tue, 31 Aug 2010 19:59:17 +0000 (12:59 -0700)]
resolve conflict from tools_r7

Change-Id: I5f416c6e77def15fdc6ae1022bbfe3033a6992ef

13 years agoMerge changes I7b091c36,I767c1513
Raphael Moll [Tue, 31 Aug 2010 19:10:40 +0000 (12:10 -0700)]
Merge changes I7b091c36,I767c1513

* changes:
  SDK Manager: Remove static package class map.
  SdkManager: exclude obsolete packages from automatic update

13 years agoMerge "Don't process events for non Android projects"
Xavier Ducrohet [Tue, 31 Aug 2010 18:20:44 +0000 (11:20 -0700)]
Merge "Don't process events for non Android projects"

13 years agoMerge "Icons for explode and outline toggle in the Layout Editor."
Xavier Ducrohet [Tue, 31 Aug 2010 17:53:14 +0000 (10:53 -0700)]
Merge "Icons for explode and outline toggle in the Layout Editor."

13 years agoMake the HierarchyViewer plug-in not screw up DDMS.
Xavier Ducrohet [Tue, 31 Aug 2010 17:36:01 +0000 (10:36 -0700)]
Make the HierarchyViewer plug-in not screw up DDMS.

The HV plug-in behaved like the standalone app and initialized
the AndroidDebugBridge with no client support (even though
this init is handled by DDMS) and would recreate the bridge
object destroying the one created by DDMS.

This completely broke DDMS.

Change-Id: Ife1187c74daef69607d508aabb1f7234507a170f

13 years agoIcons for explode and outline toggle in the Layout Editor.
Xavier Ducrohet [Tue, 31 Aug 2010 01:35:58 +0000 (18:35 -0700)]
Icons for explode and outline toggle in the Layout Editor.

Change-Id: Iee2e75bcd127c079f80d192bc21f4e692d247447

13 years agoDon't process events for non Android projects
Xavier Ducrohet [Tue, 31 Aug 2010 00:57:39 +0000 (17:57 -0700)]
Don't process events for non Android projects

Project opened event are triggered for all events.
The code would then try to get the ProjectState for
the opened project whether it was an Android project
or not, filling the log with errors.

Same thing for file modification event for default.properties.
Only care if the containing project is an Android project.

http://b.android.com/10651

Change-Id: I35d7b546794ced41cffd382a9693294cfeb3e311

13 years agoFix ddmlib's classpath to not copy Android.mk
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

13 years agoSDK Manager: Remove static package class map.
Raphael Moll [Mon, 30 Aug 2010 22:10:15 +0000 (15:10 -0700)]
SDK Manager: Remove static package class map.

When using the manager in --no-ui mode, one can use
--filter to select a list of package types to install.
This list is based on the array in SdkRepository constants
and it used need a static map to the actual classes to do
the filtering. The static map is now computed at runtime
so that we don't risk forgetting to update it.

Change-Id: I7b091c36942d3b9358595f2194f2edc76c517245

13 years agoSdkManager: exclude obsolete packages from automatic update
Raphael Moll [Mon, 30 Aug 2010 18:22:04 +0000 (11:22 -0700)]
SdkManager: exclude obsolete packages from automatic update

Fixes for SDK Manager:
- Fix --filter flag for "update sdk --no-ui"
- Filter out obsolete packages when doing automatic sdk update.
- Respect the "Display Update Only" checkbox, which internally has
  always been to display non-obsolete updates, so again filter
  obsolete packages correctly when using the UI.
- Use the same code to filter obsolete packages in the No-UI mode.

Change-Id: I767c151370a09c18c2adcc0a11e267e973622399

13 years agoFixed problem with keymap files copied to target
Magnus Karlsson [Mon, 30 Aug 2010 14:54:03 +0000 (16:54 +0200)]
Fixed problem with keymap files copied to target

Moved Android.mk and keymap files except AVRCP.kl from sdk/emulator/keymaps
to build/target/board/generic. This causes the keymap files to copied into
the system image of generic and sdk products, but not into the system image
of HW products. Originally the qwerty.kl was copied to target no matter
if the target had a qwerty keyboard or not, which is the case for e.g.
the Nexus One.

Change-Id: I37ad5fb11fa70640433594c18953b626d1e9c186

14 years agoMerge "Fix Eclipse build: also build hierarchyviewer plugin."
Raphael Moll [Sat, 28 Aug 2010 22:43:12 +0000 (15:43 -0700)]
Merge "Fix Eclipse build: also build hierarchyviewer plugin."

14 years agoFix 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

14 years agoFix Eclipse build.
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

14 years agoMerge "ADT: new action to run dexdump on project."
Raphael Moll [Sat, 28 Aug 2010 21:36:54 +0000 (14:36 -0700)]
Merge "ADT: new action to run dexdump on project."

14 years agoMerge "ADT: Make GLE2 the default."
Raphael Moll [Sat, 28 Aug 2010 04:42:56 +0000 (21:42 -0700)]
Merge "ADT: Make GLE2 the default."

14 years agoWrite tests for the new ITestRunListener API method
Omari Stephens [Sat, 7 Aug 2010 02:46:00 +0000 (19:46 -0700)]
Write tests for the new ITestRunListener API method

Change-Id: Ieea11742ae23cc30296fcc1cfe477d9814fa4a4e

14 years agoFix the ddmlib makefiles to compile tests properly
Omari Stephens [Sat, 7 Aug 2010 02:43:52 +0000 (19:43 -0700)]
Fix the ddmlib makefiles to compile tests properly

Change-Id: Id5012098dccbd264890251fdff57b91ca3ae1b85

14 years agoStore and report metrics emitted during each test case
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

14 years agoMerge "Adding a smaller timeout to capturing nodes. This is so that it doesn't get...
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."

14 years agoAdding 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

14 years agoRecompute feature dependencies.
Xavier Ducrohet [Sat, 28 Aug 2010 01:40:32 +0000 (18:40 -0700)]
Recompute feature dependencies.

Change-Id: I22afafe283cd2e114f4d3b84687adcd18c17d784

14 years agoMisc fix in HierarchyViewer plugin.
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

14 years agoFix broken plug-in
Konstantin Lopyrev [Sat, 28 Aug 2010 01:16:28 +0000 (18:16 -0700)]
Fix broken plug-in

Change-Id: I8a6c8bd4b3d5ce0d7bcda5154c0187c256ab3db9

14 years agoRenaming and adding //$NON-NLS-?$
Konstantin Lopyrev [Sat, 28 Aug 2010 00:55:52 +0000 (17:55 -0700)]
Renaming and adding  //$NON-NLS-?$

Change-Id: I9f5fa1625af4b35499cfc87996d0b3a39841ba31

14 years agoMerge "NPE in FolderDecorater"
Xavier Ducrohet [Sat, 28 Aug 2010 00:00:56 +0000 (17:00 -0700)]
Merge "NPE in FolderDecorater"

14 years agoRefactoring and integrating into Eclipse
Konstantin Lopyrev [Fri, 27 Aug 2010 16:08:34 +0000 (09:08 -0700)]
Refactoring and integrating into Eclipse

Change-Id: I1fd3c3828fb2474f2f7394ee2831fcd7eb675878

14 years agoMaking the profiling box slightly transparent
Konstantin Lopyrev [Thu, 26 Aug 2010 00:46:57 +0000 (17:46 -0700)]
Making the profiling box slightly transparent

Change-Id: I886a8b1c61db11d521657ec776152b07e7f9fabb

14 years agoMerge "Bug fixes and reducing timeout."
Konstantin Lopyrev [Fri, 27 Aug 2010 23:20:11 +0000 (16:20 -0700)]
Merge "Bug fixes and reducing timeout."

14 years agoMerge "Renaming"
Konstantin Lopyrev [Fri, 27 Aug 2010 23:20:04 +0000 (16:20 -0700)]
Merge "Renaming"

14 years agoMerge "Commentary, getting rid of bad about image, and some clean-up."
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."

14 years agoMerge "Making the profiling stuff appear in a cool place."
Konstantin Lopyrev [Fri, 27 Aug 2010 23:19:50 +0000 (16:19 -0700)]
Merge "Making the profiling stuff appear in a cool place."

14 years agoMerge "Creating the application"
Konstantin Lopyrev [Fri, 27 Aug 2010 23:19:43 +0000 (16:19 -0700)]
Merge "Creating the application"

14 years agoMerge "Tweaking and moving."
Konstantin Lopyrev [Fri, 27 Aug 2010 23:19:35 +0000 (16:19 -0700)]
Merge "Tweaking and moving."

14 years agoMerge "Add "suspended" state to thread display."
Andy McFadden [Fri, 27 Aug 2010 22:48:04 +0000 (15:48 -0700)]
Merge "Add "suspended" state to thread display."

14 years agoAdd Ant property when in release mode.
Xavier Ducrohet [Fri, 27 Aug 2010 20:47:42 +0000 (13:47 -0700)]
Add Ant property when in release mode.

Also fix some NPE in usage of ISdkLog.warning

Change-Id: Id2803f7692b82d0d2f5dea49f17f916509a7b205

14 years agoBug fixes and reducing timeout.
Konstantin Lopyrev [Wed, 25 Aug 2010 20:24:17 +0000 (13:24 -0700)]
Bug fixes and reducing timeout.

Change-Id: Ibfa23734679d0337aa7f6e250a621026b13a70f0

14 years agoRenaming
Konstantin Lopyrev [Wed, 25 Aug 2010 19:28:47 +0000 (12:28 -0700)]
Renaming

Change-Id: I10c8b1cf1be3b66fe0b7527ffb72501d8d61ebb3

14 years agoCommentary, getting rid of bad about image, and some clean-up.
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

14 years agoMaking the profiling stuff appear in a cool place.
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

14 years agoCreating the application
Konstantin Lopyrev [Thu, 19 Aug 2010 05:08:09 +0000 (22:08 -0700)]
Creating the application

Change-Id: I8f2fce7328cc1d93caed1cf003f04e41204f864c

14 years agoTweaking and moving.
Konstantin Lopyrev [Wed, 18 Aug 2010 01:00:33 +0000 (18:00 -0700)]
Tweaking and moving.

Change-Id: I9906268a91c53c7b9e938b9c969cedeae2a4303a

14 years agoMerge "Fix permissions: source files shouldn't be executable"
Omari Stephens [Thu, 26 Aug 2010 21:32:29 +0000 (14:32 -0700)]
Merge "Fix permissions: source files shouldn't be executable"

14 years agoADT: Make GLE2 the default.
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

14 years agoFix permissions: source files shouldn't be executable
Omari Stephens [Fri, 6 Aug 2010 01:37:52 +0000 (18:37 -0700)]
Fix permissions: source files shouldn't be executable

Change-Id: I4030ca07fb40e171978d8eb366b6d403e3c9ea2c

14 years agoMerge "Create MonkeyRunner docs target to generate SDK docs."
Xavier Ducrohet [Wed, 25 Aug 2010 22:48:04 +0000 (15:48 -0700)]
Merge "Create MonkeyRunner docs target to generate SDK docs."

14 years agoMerge "DOC: Updated doc for MonkeyRunner API"
Xavier Ducrohet [Wed, 25 Aug 2010 22:46:44 +0000 (15:46 -0700)]
Merge "DOC: Updated doc for MonkeyRunner API"

14 years agoMerge "sdk-docs output format for use in generating the SDK documentation for MonkeyR...
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."

14 years agoAdd "suspended" state to thread display.
Andy McFadden [Wed, 25 Aug 2010 17:05:33 +0000 (10:05 -0700)]
Add "suspended" state to thread display.

Change-Id: Id13f96d1e490228a2fc9a7452a34cd4ac7e5aa46

14 years agoADT: new action to run dexdump on project.
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

14 years agoMerge "Allow adt-tests to access package-private elements."
Brett Chabot [Tue, 24 Aug 2010 04:37:48 +0000 (21:37 -0700)]
Merge "Allow adt-tests to access package-private elements."

14 years agomerge from tools_r7
The Android Open Source Project [Mon, 23 Aug 2010 22:25:09 +0000 (15:25 -0700)]
merge from tools_r7

Change-Id: Ib8fa2647481d2d61d9bea2d5cd30fb0207e1dcf3

14 years agoMerge "SDK Launcher: add win32 app manifest" into tools_r7
Xavier Ducrohet [Mon, 23 Aug 2010 22:14:24 +0000 (15:14 -0700)]
Merge "SDK Launcher: add win32 app manifest" into tools_r7

14 years agoSDK Launcher: add win32 app manifest
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

14 years agoMerge "SDK: Rename "SDK Setup.exe" to "SDK Manager.exe"" into tools_r7
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

14 years agomerge from 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

14 years agoSDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
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

14 years agoImprove 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.

Merged from master into tools_r7

Change-Id: I1fe2fd2a2678d8c4354702250cea1481f74dd7cf

14 years agoMerge "Improve capability of the post-compile target."
Xavier Ducrohet [Mon, 23 Aug 2010 22:06:40 +0000 (15:06 -0700)]
Merge "Improve capability of the post-compile target."

14 years agoImprove 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

14 years agoMerge "SDK: Rename "SDK Setup.exe" to "SDK Manager.exe""
Raphael Moll [Mon, 23 Aug 2010 21:01:32 +0000 (14:01 -0700)]
Merge "SDK: Rename "SDK Setup.exe" to "SDK Manager.exe""

14 years agoMerge "SDK Launcher: add win32 app manifest"
Raphael Moll [Mon, 23 Aug 2010 21:01:24 +0000 (14:01 -0700)]
Merge "SDK Launcher: add win32 app manifest"

14 years agoSDK: Rename "SDK Setup.exe" to "SDK Manager.exe"
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

14 years agoMerge "Fix error strings: it's "dx.jar", not "dex.jar""
Raphael Moll [Mon, 23 Aug 2010 20:11:14 +0000 (13:11 -0700)]
Merge "Fix error strings: it's "dx.jar", not "dex.jar""

14 years agomerge from tools_r7
The Android Open Source Project [Mon, 23 Aug 2010 20:05:56 +0000 (13:05 -0700)]
merge from tools_r7

Change-Id: I1c48422d1732d53527d7afae6c30c285bee54146

14 years agoAndroid.bat support for Java 64-bit.
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

14 years agoMerge "Android.bat support for Java 64-bit."
Raphael Moll [Mon, 23 Aug 2010 19:42:23 +0000 (12:42 -0700)]
Merge "Android.bat support for Java 64-bit."

14 years agoNPE in FolderDecorater
snpe [Wed, 18 Aug 2010 19:24:41 +0000 (21:24 +0200)]
NPE in FolderDecorater

Change-Id: Ica70dedb0b86ab877337d001aac6a205b15a60c0

14 years agoSDK Launcher: add win32 app manifest
Raphael Moll [Sun, 22 Aug 2010 00:59:12 +0000 (17:59 -0700)]
SDK Launcher: add win32 app manifest

Change-Id: Iac3ad3d28d62c67b15b75346a56c2194f1837096

14 years agoAllow adt-tests to access package-private elements.
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

14 years agoFix error strings: it's "dx.jar", not "dex.jar"
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

14 years agoDisable tests using EasyMock to fix build.
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

14 years agoAndroid.bat support for Java 64-bit.
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

14 years agoMerge changes Ie49a141a,I71c6f4b6
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

14 years agoMerge "ADT GLE unit tests."
Raphael Moll [Sat, 21 Aug 2010 18:01:30 +0000 (11:01 -0700)]
Merge "ADT GLE unit tests."

14 years agoMerge "Force disconnect of all devices when adb connection is lost."
Brett Chabot [Sat, 21 Aug 2010 00:01:21 +0000 (17:01 -0700)]
Merge "Force disconnect of all devices when adb connection is lost."

14 years agomerge from tools_r7
The Android Open Source Project [Fri, 20 Aug 2010 17:51:08 +0000 (10:51 -0700)]
merge from tools_r7

Change-Id: I0a73800c5f6454a012d6556668aa98ddfb53db3a

14 years agoMerge sdklib manifest fix for r7. DO NOT MERGE.
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

14 years agoCreate MonkeyRunner docs target to generate SDK docs.
Bill Napier [Fri, 20 Aug 2010 05:47:36 +0000 (22:47 -0700)]
Create MonkeyRunner docs target to generate SDK docs.

Change-Id: Id84e1aec8965ac0efc58c25234855960e826fb3b

14 years agosdk-docs output format for use in generating the SDK documentation for MonkeyRunner.
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

14 years agoUnitTest for UpdaterLogic.findPlatformToolsDependency.
Raphael Moll [Fri, 20 Aug 2010 03:56:26 +0000 (20:56 -0700)]
UnitTest for UpdaterLogic.findPlatformToolsDependency.

Change-Id: Ie49a141ad0d25021164166aeb4405877045719bf

14 years agoSDK Manager support for Platform-Tools
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

14 years agoMerge "Transition from clearsilver to jsilver"
Ben Dodson [Thu, 19 Aug 2010 22:23:46 +0000 (15:23 -0700)]
Merge "Transition from clearsilver to jsilver"

14 years agoTransition from clearsilver to jsilver
Ben Dodson [Thu, 19 Aug 2010 22:15:50 +0000 (15:15 -0700)]
Transition from clearsilver to jsilver

Change-Id: Iea2fb85b246685b1c2e27866bb1c1df80fa55abe

14 years agoMerge "Adding property and profile viewers + misc"
Konstantin Lopyrev [Thu, 19 Aug 2010 22:06:39 +0000 (15:06 -0700)]
Merge "Adding property and profile viewers + misc"

14 years agoMerge "Increasing the changes of a device connecting properly and making sure things...
Konstantin Lopyrev [Thu, 19 Aug 2010 22:06:10 +0000 (15:06 -0700)]
Merge "Increasing the changes of a device connecting properly and making sure things are disposed of properly."