OSDN Git Service
Xavier Ducrohet [Fri, 12 Mar 2010 02:48:56 +0000 (18:48 -0800)]
Disable writting the apk settings.
This is not fully supported. Its presence in
default.properties can be confusing the devs
in thinking this is supported.
Also removed a useless helper class.
Change-Id: Ia26b31e258f53964a437c7bbe202da857796df8e
Xavier Ducrohet [Thu, 11 Mar 2010 00:49:38 +0000 (16:49 -0800)]
Move ant.prop to sdk.prop and up a folder.
this file is meant to have general sdk properties, not
just Ant ones.
Also separated the library support from the Ant build version.
It's clearer whether or not libraries are supported, and it's
not just tied to Ant anyway (ADT needs to know as well).
Finally use that new property to do checks on library support
in both the custom Ant tasks and ADT.
Depends on a CL in development.git (sdk.atree change).
Change-Id: I77d229ed3fd60f0468b1d3d31f7cf147b03a32fb
Xavier Ducrohet [Thu, 11 Mar 2010 21:06:17 +0000 (13:06 -0800)]
Merge "Make some errors warnings instead when parsing the SDK."
Xavier Ducrohet [Thu, 11 Mar 2010 21:04:37 +0000 (13:04 -0800)]
Merge "Make sure to compare normalize path when comparing libraries."
Xavier Ducrohet [Thu, 11 Mar 2010 03:27:53 +0000 (19:27 -0800)]
Make sure to compare normalize path when comparing libraries.
Change-Id: Idb8e7fcf316202c9b9a937e9b67bcce3db419fc0
Xavier Ducrohet [Wed, 10 Mar 2010 22:29:59 +0000 (14:29 -0800)]
Make some errors warnings instead when parsing the SDK.
Errors are always displayed, warning only in verbose mode.
Bug:
2502224
Change-Id: I8380e63d7a9c936187fa4c557849d9a2bacc13a2
Brett Chabot [Wed, 10 Mar 2010 22:09:02 +0000 (14:09 -0800)]
Handle incomplete instrumentation test as a failure.
Change instrumentation result parser to record a instrumentation test that was
started, but not completed due to a run failure, as a test failure.
Change-Id: I1296a9064a13ee0ba10e8352cd2cc8b54930043e
Brett Chabot [Wed, 10 Mar 2010 20:57:57 +0000 (12:57 -0800)]
Merge "Add support for multiple instrumentation test result listeners."
Xavier Ducrohet [Wed, 10 Mar 2010 20:40:03 +0000 (12:40 -0800)]
Merge "ADT: reload libraries when default.properties is edited."
Brett Chabot [Wed, 10 Mar 2010 03:58:47 +0000 (19:58 -0800)]
Add support for multiple instrumentation test result listeners.
Change-Id: I12b273582880fadefcd233df45960811b8f16d49
Brett Chabot [Wed, 10 Mar 2010 03:55:13 +0000 (19:55 -0800)]
Merge "Make "Main menu > Run As > Android application" appear in ADT ."
Brett Chabot [Wed, 10 Mar 2010 02:24:04 +0000 (18:24 -0800)]
Make "Main menu > Run As > Android application" appear in ADT .
Bug
1841601
Change-Id: I7035584a18cf43eb488215c5ff6832ba499498e1
Xavier Ducrohet [Fri, 5 Mar 2010 02:39:27 +0000 (18:39 -0800)]
ADT: reload libraries when default.properties is edited.
Misc: add a folder decorator for library source folders.
Change-Id: I8c9d8abba2341c0caca09ad1bd706613103cee05
Jean-Baptiste Queru [Tue, 9 Mar 2010 02:05:23 +0000 (18:05 -0800)]
Add an empty CleanSpec.mk
Change-Id: Id24b3d91d79b0dac9402c9eaab49c8742a089aaa
Raphael [Tue, 9 Mar 2010 00:48:39 +0000 (16:48 -0800)]
Merge "ADT GLE: pass dragged FQCN to IViewRules"
Raphael [Tue, 9 Mar 2010 00:27:27 +0000 (16:27 -0800)]
ADT GLE: pass dragged FQCN to IViewRules
Change-Id: Iee6868e65ebdb98a8b62dd07d8490e5363e6f3af
Raphael [Tue, 9 Mar 2010 00:45:49 +0000 (16:45 -0800)]
Merge "SDK Manager: fix displayed dependencies at installation."
Raphael [Mon, 8 Mar 2010 21:11:49 +0000 (13:11 -0800)]
Merge "SDK Manager: Fix typo in addon dir selection."
Raphael [Sun, 7 Mar 2010 01:36:14 +0000 (17:36 -0800)]
ADT NPW: fixes in "create project from existing" mode.
When an activity is found in the imported manifest:
- do not check that there's a .java matching the activity name found
- do not check the Create Activity checkbox
- do not fill the activity name in the info panel.
- disable app name in info panel and don't fill
- disable minSdkVersion
Change-Id: Ifc15b6e019e45a561c3a6ce781bfc48f3f097962
Raphael [Mon, 8 Mar 2010 19:22:46 +0000 (11:22 -0800)]
SDK Manager: Fix typo in addon dir selection.
Follow up for change I1d7412de
SDK Bug
2277394
Change-Id: I553e8db093661f9abfd45791f194929e52775212
Raphael [Mon, 8 Mar 2010 19:13:46 +0000 (11:13 -0800)]
Merge "SDK Manager recomputes addon install folder name."
Raphael [Mon, 8 Mar 2010 19:13:29 +0000 (11:13 -0800)]
Merge "ADT GLE2: Fix drop coordinates, add FrameLayout.groovy"
Raphael [Mon, 8 Mar 2010 19:11:56 +0000 (11:11 -0800)]
Merge "NPE in ADT when opening/closing projects if there's a layout open."
Raphael [Mon, 8 Mar 2010 19:11:51 +0000 (11:11 -0800)]
Merge "ADT NPW: fill the samples combo when only one platform is installed."
Raphael [Sun, 7 Mar 2010 03:54:27 +0000 (19:54 -0800)]
SDK Manager recomputes addon install folder name.
SDK Bug
2277349
Change-Id: I1d7412deeda45c8a85072a7ee8d371b5bee6a9a0
Brett Chabot [Mon, 8 Mar 2010 18:58:11 +0000 (10:58 -0800)]
Merge "Add ability to detect incomplete test runs to InstrumentationResultParser."
Raphael [Sun, 7 Mar 2010 03:09:22 +0000 (19:09 -0800)]
SDK Manager: fix displayed dependencies at installation.
2 changes:
- No longer display packages already locally installed as dependencies.
- Changed the wording at install time to clearly indicate that
"installing package X also requires installing Y and Z".
That's just wording but I think it should clear the confusion and
really says what the code is actually going to do, e.g.:
- if X depends on tools r5 and you don't have r5, it will correctly
state "requires installing missing tools r5"
- if X depends on tools r5 and you have r6 in the repo, it will
correctly state "requires installing tools r6".
SDK Bug
2418140
Change-Id: I84f8d145d896102410349241ad39eadd09215de8
Raphael [Sun, 7 Mar 2010 01:08:01 +0000 (17:08 -0800)]
NPE in ADT when opening/closing projects if there's a layout open.
Change-Id: Ic9a63c9db8eee095a1a13c5905241ae2e21a29a6
Raphael [Sat, 6 Mar 2010 23:12:31 +0000 (15:12 -0800)]
ADT NPW: fill the samples combo when only one platform is installed.
SDK Bug
2475303
Change-Id: I339ba75b0b8c4639522e394dc34807fb04563756
Raphael [Sat, 6 Mar 2010 05:27:28 +0000 (21:27 -0800)]
ADT GLE2: Fix drop coordinates, add FrameLayout.groovy
1- Fix computation of scrolled drop coordinates: margin constant
should not be used directly and is now private to the Scaling
helper class. The Drop class now defers to the Canvas to convert
display coordinates into canvas image coordinates.
2- Fixed a small bug when LinearLayout was computing the
insertion point when there were no children.
3- Added a basic FrameLayout for drop support.
Change-Id: Iaf1305bd3df16b62fe29568eb811d36704f86482
David 'Digit' Turner [Fri, 5 Mar 2010 22:52:24 +0000 (14:52 -0800)]
Fix sensor emulation.
This gets rid of a bug where the control fd would be closed when the
data channel is opened, making the later activation of sensors impossible.
Also add more debugging messages.
Brett Chabot [Tue, 2 Mar 2010 18:53:37 +0000 (10:53 -0800)]
Add ability to detect incomplete test runs to InstrumentationResultParser.
And clean-up whitespace.
Change-Id: Icb6bd5c8bf403fda0de436d4b9e732e7ea976267
Xavier Ducrohet [Wed, 3 Mar 2010 23:12:43 +0000 (15:12 -0800)]
Merge "ADT: reload layout when resources from libraries change."
Xavier Ducrohet [Wed, 3 Mar 2010 20:56:10 +0000 (12:56 -0800)]
ADT: reload layout when resources from libraries change.
Change-Id: I49dde5bac355b0321701cddcfc1332a99d8c8efb
Romain Guy [Wed, 3 Mar 2010 20:05:57 +0000 (12:05 -0800)]
Merge "Add the ability to export any window as a layered PSD file."
Romain Guy [Wed, 3 Mar 2010 01:07:03 +0000 (17:07 -0800)]
Add the ability to export any window as a layered PSD file.
Xavier Ducrohet [Tue, 2 Mar 2010 02:52:50 +0000 (18:52 -0800)]
ADT: Make ProjectResources include the libraries resources.
This is only needed for the layout rendering so we restrict this
to getConfiguredResources since it's called for every rendering
anyway (and only there).
Still need to trigger new rendering when a library resource
changed.
Change-Id: I2241c84626cbafaefc51db3718be54a4937d0657
Raphael [Tue, 2 Mar 2010 23:00:56 +0000 (15:00 -0800)]
Merge "ADT: GLE ConfigComposite crashes when target==null"
Xavier Ducrohet [Tue, 2 Mar 2010 22:56:29 +0000 (14:56 -0800)]
Merge "ADT: Fix library handling during project renaming."
Xavier Ducrohet [Tue, 2 Mar 2010 22:42:08 +0000 (14:42 -0800)]
ADT: Fix library handling during project renaming.
When implmenting the full open/close support, I moved
libraryState.close() to the job when closing a library
project.
Since this is asynchronous, the library state wasn't
correct when projectOpen/Renamed were called, breaking
proper handling of a library project being renamed.
Moved back the call to close in the projectClosed
callback.
Change-Id: Iabf03a9c068bc6246bd162e46bc3111d8f52c434
Raphael [Tue, 2 Mar 2010 22:10:29 +0000 (14:10 -0800)]
ADT: GLE ConfigComposite crashes when target==null
SDK Bug
2482495
Change-Id: If7c64afc66af1c38b4a4d7a31ded6035a8c3e94d
Raphael [Mon, 1 Mar 2010 05:28:31 +0000 (21:28 -0800)]
ADT GLE2: Snap to RelativeLayout borders
Raphael [Tue, 2 Mar 2010 19:35:58 +0000 (11:35 -0800)]
ADT & libs: change ISdkLog to be a mandatory non-null parameter.
Mostly a javadoc change describing the log arguments as necessary.
In the SDK & AVD Manager code, also removed the log!=null checks.
This makes it consistent with the repository code too which
already had this assumption.
SD Bug
2477460
Change-Id: I5ba7ae6a2c7685805e43a115359f99f2f0caa815
Xavier Ducrohet [Tue, 2 Mar 2010 01:01:18 +0000 (17:01 -0800)]
ADT: Setup projects that are opened after their libraries.
Change-Id: I2e556b8b993dda29feaff272d44b6b048597f8a7
Xavier Ducrohet [Tue, 2 Mar 2010 00:19:11 +0000 (16:19 -0800)]
ADT: properly handle removed library project.
This edits the projects referencing the library to remove
the linked folder from the build path and delete it.
If the library is actually deleted this also remove the
path variable for the linked resource.
Also, force a recompile when a library project is opened
and linked to a main project. Apparently adding a new
source folder triggers only an incremental build instead
of a full (like removing a source folder does), and this
doesn't force recompiling the resources.
Change-Id: I005840bfa5c381160e5658755ebeec2db3eab19d
Xavier Ducrohet [Tue, 2 Mar 2010 02:47:13 +0000 (18:47 -0800)]
ADT: reimplement Path.makeRelativeTo as it's only accessible to Eclipse 3.5+
Change-Id: I2c23eefcfeb6cd3e97ae18273174043b38e79e58
Xavier Ducrohet [Mon, 1 Mar 2010 23:12:40 +0000 (15:12 -0800)]
Merge "ADT: handle project open/close/rename for library support."
Xavier Ducrohet [Sat, 27 Feb 2010 00:51:44 +0000 (16:51 -0800)]
ADT: handle project open/close/rename for library support.
Change-Id: Id08883948adb65ce749ea53d54738e0ff02ed8b4
Raphael [Mon, 1 Mar 2010 19:40:12 +0000 (11:40 -0800)]
Merge "ADT: Fix NPE when SDK Manager uses a null ISdkLog."
Brett Chabot [Mon, 1 Mar 2010 19:14:27 +0000 (11:14 -0800)]
Merge "Extract an interface out of RemoteAndroidTestRunner so it can be mocked."
Raphael [Mon, 1 Mar 2010 05:50:41 +0000 (21:50 -0800)]
ADT: Fix NPE when SDK Manager uses a null ISdkLog.
SDK Bug:
2477460
Note: this fixes the NPE but it also makes sure we give
an ISdkLog even when calling from the toolbar SDK Manager
button or from the AVD Selector > Manager button.
Maybe it would be better to just assume the logger is never
null, remove the log==null checks all over the place and
correctly comment "log cannot be null" in the methods javadocs.
Change-Id: I50f65d698b7507b5e9eca866a332290f92edd05a
Brett Chabot [Sun, 28 Feb 2010 03:23:24 +0000 (19:23 -0800)]
Extract an interface out of RemoteAndroidTestRunner so it can be mocked.
Change-Id: I44c6b3db304ce1203edaa7b80500eed46706e0f5
Mathias Agopian [Sat, 27 Feb 2010 01:07:10 +0000 (17:07 -0800)]
Merge "fix [
2418333] SensorManager hogs CPU on emulator"
Mathias Agopian [Sat, 27 Feb 2010 00:44:09 +0000 (16:44 -0800)]
fix [
2418333] SensorManager hogs CPU on emulator
The emulator sensor code could enter a busy loop on certain
failure cases in poll.
Raphael Moll [Sat, 27 Feb 2010 00:38:46 +0000 (16:38 -0800)]
Merge "ADT GLE2: Support for drop on RelativeLayout children."
Raphael [Sat, 27 Feb 2010 00:11:05 +0000 (16:11 -0800)]
ADT GLE2: Support for drop on RelativeLayout children.
Change-Id: I6ed9f1d89f61caf6141f23708854a01247ab5518
Xavier Ducrohet [Fri, 26 Feb 2010 00:30:25 +0000 (16:30 -0800)]
ADT: clean up implementation of listeners here and there.
Use delegate instead of main class so that listener callbacks
are not part of the class API.
Change-Id: I917c17c3b3d7ae3f125834d773f041b5b57b8c3f
Xavier Ducrohet [Thu, 25 Feb 2010 23:28:28 +0000 (15:28 -0800)]
Add a delta visitor for the library projects.
This is used by the precompiler to trigger recompilation
of the resource (generates R.java) and by the ApkBuilder
to trigger resource packaging.
Change-Id: I3a18817a50aa2cdbbd3745a2bba0fda2adbf8556
Xavier Ducrohet [Thu, 25 Feb 2010 19:38:55 +0000 (11:38 -0800)]
Merge "ADT: Apkbuilder now adds the library resources to the apk."
Xavier Ducrohet [Thu, 25 Feb 2010 19:38:18 +0000 (11:38 -0800)]
Merge "Fix project creation by properly creating default.properties if needed."
Xavier Ducrohet [Thu, 25 Feb 2010 19:38:06 +0000 (11:38 -0800)]
Merge "detect too recent version of the ant rules and display an error."
Raphael Moll [Thu, 25 Feb 2010 05:09:00 +0000 (21:09 -0800)]
Merge "ADT GLE2: Support zoom and scrollbar in canvas."
Xavier Ducrohet [Thu, 25 Feb 2010 03:02:50 +0000 (19:02 -0800)]
ADT: Apkbuilder now adds the library resources to the apk.
Change-Id: Ic29acc53605bd580bfef44278b6997acff76e849
Xavier Ducrohet [Thu, 25 Feb 2010 00:22:07 +0000 (16:22 -0800)]
detect too recent version of the ant rules and display an error.
This is to solve the case where a user somehow update a platform
component but not the tools. the custom Ant tasks will detect
the revision of the ant rules and fail if it's too recent.
Change-Id: Ica91a500ca980f9ed5f3a7c4fb09b85a63b8037b
Xavier Ducrohet [Thu, 25 Feb 2010 00:51:35 +0000 (16:51 -0800)]
Move sdklib.internal.io.* into sdklib.io
Some other "public" API (AndroidManifest) depends on it
so it should be public too.
Change-Id: I88cd299bbd60df8f4dac5fe029bb52c0c0c2f16c
Xavier Ducrohet [Wed, 24 Feb 2010 22:41:30 +0000 (14:41 -0800)]
Fix project creation by properly creating default.properties if needed.
This was broken by the commit that introduced ProjectState.
Also fixed issue when default.properties was changed outside of Eclipse.
ADT now properly reload it content and re-resolve the target.
Change-Id: I7866feee626e8e22bdb37638eed1aca03c934382
Raphael [Wed, 24 Feb 2010 22:16:07 +0000 (14:16 -0800)]
ADT GLE2: Support zoom and scrollbar in canvas.
Change-Id: I98442be1d01cff0227244c4e1d346b8642106a79
Xavier Ducrohet [Wed, 24 Feb 2010 20:56:52 +0000 (12:56 -0800)]
Merge "Fix build of the plugin: builders project is gone."
Xavier Ducrohet [Wed, 24 Feb 2010 20:56:12 +0000 (12:56 -0800)]
Fix build of the plugin: builders project is gone.
Change-Id: If128a3feb42f2b680a3d155180bdc58096183a8b
Xavier Ducrohet [Wed, 24 Feb 2010 19:45:09 +0000 (11:45 -0800)]
Merge work related to library projects from sdk-dev to
Change-Id: Id68032067ab4e983296909a0b2536acaca08371d
The Android Open Source Project [Wed, 24 Feb 2010 19:18:41 +0000 (11:18 -0800)]
The Android Open Source Project [Wed, 24 Feb 2010 17:56:49 +0000 (09:56 -0800)]
merge from open-source master
The Android Open Source Project [Wed, 24 Feb 2010 17:41:10 +0000 (09:41 -0800)]
snapshot
Xavier Ducrohet [Wed, 24 Feb 2010 04:31:43 +0000 (20:31 -0800)]
Improve the IAbstractFile/Folder classes.
- Add setContent to the file class
- add listMembers to the folder class
- extend java.io.File instead of using a delegate.
Change-Id: Ib6434b37c8cceb6661bc6a17ae678a56d2c243f2
Xavier Ducrohet [Wed, 24 Feb 2010 01:51:46 +0000 (17:51 -0800)]
Merge remote branch 'goog/master' into HEAD
Xavier Ducrohet [Fri, 19 Feb 2010 03:52:14 +0000 (19:52 -0800)]
ADT: Library support: source folder and pre-compiler.
This is the first step in the library support.
For each library, create a source folder in the main project that
is linked to the source folder of the library project.
The linked resources use a path variable named after the library
in the format: _android_<library name>.
These variables are always created when the link is created.
For now the link is recreated all the time, but we could
do a check and not redo it if it's already done.
Additionally, the pre-compiler creates the R class from
the res folders of the main and library projects.
Some misc fixes/clean-ups:
* Fix an issue with the new ProjectState where opening a
project would not trigger a load of its target data.
* Changed the lock for all SDK operation:
- moved the lock in Sdk accessible as Sdk.getLock()
- made the few Sdk method that used their own synchronize
block use the same lock as all others.
* removed the builders project and moved its content to sdklib
This was meant as a way to share code between the Eclipse
builders and the Ant tasks but sdklib is already used by
both, so it's better to put the code in sdklib than
have yet another project.
Change-Id: Ibfa449c7a809f28e428c03bbda8215969717ecde
Xavier Ducrohet [Wed, 24 Feb 2010 00:05:10 +0000 (16:05 -0800)]
Only add gdbserver to the APK if the manifest has debuggable to true.
Change-Id: I2411f59f46cdda2e12b1627d450cde6c9cd109d8
Raphael [Tue, 23 Feb 2010 05:54:18 +0000 (21:54 -0800)]
ADT GLE: fix scrollbar in palette composite.
Change-Id: Ic9bd947b7b6b52f69f6eab9c4d38e63557b23c70
Raphael [Mon, 22 Feb 2010 22:23:00 +0000 (14:23 -0800)]
ADT GLE: Experiment with d'n'd in RelativeLayout.
Change-Id: Ic737d5273b55a4ec78c1d9789616e1e296b77b00
Xavier Ducrohet [Mon, 22 Feb 2010 19:31:13 +0000 (11:31 -0800)]
Merge "Prevent AVD Manager in ADT from forcing reload of the targets."
Xavier Ducrohet [Sat, 20 Feb 2010 01:44:39 +0000 (17:44 -0800)]
Prevent AVD Manager in ADT from forcing reload of the targets.
When the AVD Manager launches, it would notify some listener
that the SDK is changed. This was because it used the SDK Changed
event as a way to initialize the pages.
In ADT, an extra listener actually reload the SDK manager
inside ADT when that event triggers, making the SDK also
reload when the AVD Manager window is opened.
The fix is to add a flag to the listener interface to
distinguish initial load and actual SDK change.
Change-Id: I395dc305fa0d698889cdbd7bb7db7d540dde568b
Raphael [Fri, 19 Feb 2010 05:47:52 +0000 (21:47 -0800)]
ADT GLE: experiment with display of Relative layout params.
Change-Id: Icd8ac13e91b575c7133c5c0256a46e3c16e5fae8
Xavier Ducrohet [Fri, 19 Feb 2010 00:30:41 +0000 (16:30 -0800)]
Clean up for how the ADT plug-in keeps track of project and their targets.
For some the (IProject, IAndroidTarget) map was only filled when a project
was created or had its target changed. Other projects that were just opened
in the workspace wouldn't be put in the map, making each call to Sdk.getTarget()
read the default.properties.
This commit adds a new class ProjectState to centralize the state of a project
including target info, apk settings and soon libraries.
The project state are stored statically in Sdk so that they survive Sdk reload.
I'm cleaning up the API of Sdk also to make it let complex and weird.
Change-Id: I1324c622a646486a474ce26b2172385f00091b3f
Raphael [Thu, 18 Feb 2010 06:30:03 +0000 (22:30 -0800)]
ADT GLE: new IViewRule interface for Drag'n'drop.
With implementation for AbsoluteLayout and LinearLayout.
Change-Id: If8d6301abcc848574b3ab5d8894396a0246b1275
Xavier Ducrohet [Wed, 17 Feb 2010 01:42:42 +0000 (17:42 -0800)]
Change the property names to something better.
Once added to the rest of the properties, "revision.*" is a bit
to vague.
Change-Id: Ifaca600ac3a5c6de35aa6bd1465a0a3fc2ccde52
Xavier Ducrohet [Wed, 17 Feb 2010 01:55:41 +0000 (17:55 -0800)]
Check whether the project's target supports libraries.
Check is done when:
- a library is added to a project through "android update project"
- a project is compiled through Ant
Change-Id: I09993b9aac5ad32a84335647429fc52fa2babaf9
Xavier Ducrohet [Wed, 17 Feb 2010 01:42:42 +0000 (17:42 -0800)]
Change the property names to something better.
Once added to the rest of the properties, "revision.*" is a bit
to vague.
Change-Id: I386780f3bd3b39ef6ea49d1c8d3c717cb263b6a1
Xavier Ducrohet [Wed, 17 Feb 2010 00:05:20 +0000 (16:05 -0800)]
Merge remote branch 'goog/master' into HEAD
Xavier Ducrohet [Tue, 16 Feb 2010 23:25:39 +0000 (15:25 -0800)]
Add Ant build/template revision to the SDK platforms.
Change-Id: I1cd3964707c5472851c6868796649e62b4f2d232
Raphael Moll [Sat, 13 Feb 2010 05:07:51 +0000 (21:07 -0800)]
Merge "ADT GRE: Resolve gscripts groovy imports."
Xavier Ducrohet [Sat, 13 Feb 2010 03:24:51 +0000 (19:24 -0800)]
Fix the build for good this time.
MANIFEST.MF had a bad conflict resolution.
Xavier Ducrohet [Sat, 13 Feb 2010 02:43:06 +0000 (18:43 -0800)]
Merge "Fix Eclipse ADT build."
Xavier Ducrohet [Sat, 13 Feb 2010 02:41:38 +0000 (18:41 -0800)]
Fix Eclipse ADT build.
Xavier Ducrohet [Sat, 13 Feb 2010 01:23:36 +0000 (17:23 -0800)]
Merge remote branch 'goog/master' into HEAD
Conflicts:
eclipse/plugins/com.android.ide.eclipse.adt/.classpath
eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
eclipse/plugins/com.android.ide.eclipse.adt/build.properties
eclipse/plugins/com.android.ide.eclipse.tests/.classpath
Change-Id: I4013ba2d22e5b602329534ff602c7a7e7ce38567
Xavier Ducrohet [Fri, 12 Feb 2010 22:13:02 +0000 (14:13 -0800)]
New "builders" project for common code to Eclipse and Ant.
This new project will contain build specific code used by both
the custom Ant tasks and the Eclipse builders.
The first code to go in there, is the IAbstractFile/Folder classes
already used by Eclipse as an abstraction layer for file/folder
access when some code needs to use both the Java IO API and the
Eclipse resources API.
The builders project include the implementation for the Java IO,
while the Eclipse implementation is in ADT.
Xavier Ducrohet [Fri, 12 Feb 2010 22:13:02 +0000 (14:13 -0800)]
New "builders" project for common code to Eclipse and Ant.
This new project will contain build specific code used by both
the custom Ant tasks and the Eclipse builders.
The first code to go in there, is the IAbstractFile/Folder classes
already used by Eclipse as an abstraction layer for file/folder
access when some code needs to use both the Java IO API and the
Eclipse resources API.
The builders project include the implementation for the Java IO,
while the Eclipse implementation is in ADT.
Change-Id: I93d07117678000531bd17540b1ccddca8edb86ad
Raphael [Wed, 10 Feb 2010 18:40:16 +0000 (10:40 -0800)]
ADT GRE: Resolve gscripts groovy imports.
This reconfigures the Groovy engine:
- The user projects /gscripts folder is added to the groovy class path
(so user can import their own local classes.)
- The IViewRule package is added as a default import (using the
import .* syntax), which means the scripts don't have the specify
every single import anymore.
- Our scripts can now extend each others -- as long as the classes are
in our package they will be resolved and loaded.
Change-Id: I79dabf7d1317a1bf4a0fc04ee8ba0987dca7da15
Xavier Ducrohet [Thu, 11 Feb 2010 23:02:48 +0000 (15:02 -0800)]
Add support for creating/updating library project to the "android" command-line tool.
Also, support to add a reference to a library from a regular project.
Bug:
2294012
Change-Id: I5323dd5816426651a1e77ab206d9d17ee5749813
Raphael [Wed, 10 Feb 2010 23:25:57 +0000 (15:25 -0800)]
Update prebuilt Groovy JAR to 1.7.0
Depends on Change Ie2684212
Change-Id: I3c269c7e972b8fcb207409732c450fab1544b508
Xavier Ducrohet [Thu, 11 Feb 2010 00:43:50 +0000 (16:43 -0800)]
Merge remote branch 'goog/master' into HEAD