NPW Sample Wizard: list extras with a "sample" directory.

Some extras have just a single "sample" directory
instead of having a samples/<sample_name> directory.
Support this and list them as valid samples.

Change-Id: I25bc59db0b9853d98385cca98f70bf261558fd8b

1 files changed, 8 insertions, 0 deletions

diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java
index 5986387..0bca185 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java
@@ -381,6 +381,14 @@ public class SdkManager {
                 File path = new File(a.getLocalOsPath(), SdkConstants.FD_SAMPLES);
                 if (path.isDirectory()) {
                     samples.put(path, pkg.getListDescription());
+                    continue;
+                }
+                // Some old-style extras simply have a single "sample" directory.
+                // Accept it if it contains an AndroidManifest.xml.
+                path = new File(a.getLocalOsPath(), SdkConstants.FD_SAMPLE);
+                if (path.isDirectory() &&
+                        new File(path, SdkConstants.FN_ANDROID_MANIFEST_XML).isFile()) {
+                    samples.put(path, pkg.getListDescription());
                 }
             }
         }