Mark linked folders from Library projects to be derived.

Team plug-ins should already ignore linked resources, but it seems
that some don't so marking them as derived is a safer bet.

Change-Id: Id1c82ae8a5aafabd39829034aa805cd3339f0c1a

diff --git a/eclipse/changes.txt b/eclipse/changes.txt
index f9eaf9d..293e790 100644 (file)
--- a/eclipse/changes.txt
+++ b/eclipse/changes.txt
@@ -2,6 +2,7 @@
 - Fixed issue with library project names containing characters that aren't compatible with Eclipse path variable. The link between the main project and the library would fail to create.
 - Added support for library projects that don't have a source folder called "src". There is now support for any number of source folder, with no name restriction. They can even be in sub folder such as "src/java".
 - Added support for libraries with library dependencies.
+- Library source folders linked into the main project are now properly set as derived to be ignored by Team plug-ins.
 - added support for new resource qualifiers: car/desk, night/notnight and navexposed/navhidden
 
 0.9.7:

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java
index a4c216c..b67a5be 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/sdk/Sdk.java
@@ -1362,6 +1362,9 @@ public final class Sdk  {
                         libSrc.createLink(linkedPath,
                                 IResource.REPLACE, monitor);
 
+                        // mark it as derived so that Team plug-in ignore this
+                        libSrc.setDerived(true);
+
                         // set some persistent properties on it to know that it was
                         // created by ADT.
                         ProjectHelper.saveStringProperty(libSrc, PROP_CREATOR, CREATOR_ADT);