49 files changed, 72 insertions, 72 deletions
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/.classpath b/eclipse/plugins/com.android.ide.eclipse.ndk/.classpath
index d37aeb2..d37aeb2 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/.classpath
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/.project b/eclipse/plugins/com.android.ide.eclipse.ndk/.project
index 5771a44..15270be 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/.project
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>adt-ndk</name>
+	<name>ndk</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/.settings/org.eclipse.jdt.core.prefs b/eclipse/plugins/com.android.ide.eclipse.ndk/.settings/org.eclipse.jdt.core.prefs
index 5381a0e..5381a0e 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/.settings/org.eclipse.jdt.core.prefs
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/.settings/org.eclipse.jdt.core.prefs
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.ndk/META-INF/MANIFEST.MF
index 35e8537..1270762 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: ADT CDT Integration
-Bundle-SymbolicName: com.android.ide.eclipse.adt.ndk;singleton:=true
+Bundle-SymbolicName: com.android.ide.eclipse.ndk;singleton:=true
 Bundle-Version: 17.0.0.qualifier
-Bundle-Activator: com.android.ide.eclipse.adt.ndk.internal.Activator
+Bundle-Activator: com.android.ide.eclipse.ndk.internal.Activator
 Bundle-Vendor: The Android Open Source Project
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/MODULE_LICENSE_EPL b/eclipse/plugins/com.android.ide.eclipse.ndk/MODULE_LICENSE_EPL
index e69de29..e69de29 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/MODULE_LICENSE_EPL
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/MODULE_LICENSE_EPL
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/NOTICE b/eclipse/plugins/com.android.ide.eclipse.ndk/NOTICE
index 49c101d..49c101d 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/NOTICE
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/NOTICE
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/about.html b/eclipse/plugins/com.android.ide.eclipse.ndk/about.html
index bc621cb..bc621cb 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/about.html
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/about.html
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/about.ini b/eclipse/plugins/com.android.ide.eclipse.ndk/about.ini
index 2d7cdaa..2d7cdaa 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/about.ini
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/about.ini
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/about.properties b/eclipse/plugins/com.android.ide.eclipse.ndk/about.properties
index 34218e9..34218e9 100755
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/about.properties
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/about.properties
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/build.properties b/eclipse/plugins/com.android.ide.eclipse.ndk/build.properties
index 4842ac1..4842ac1 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/build.properties
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/build.properties
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/discovery/test.c b/eclipse/plugins/com.android.ide.eclipse.ndk/discovery/test.c
index e69de29..e69de29 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/discovery/test.c
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/discovery/test.c
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/discovery/test.cpp b/eclipse/plugins/com.android.ide.eclipse.ndk/discovery/test.cpp
index e69de29..e69de29 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/discovery/test.cpp
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/discovery/test.cpp
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/icons/android-32.png b/eclipse/plugins/com.android.ide.eclipse.ndk/icons/android-32.png
index 4e0cc13..4e0cc13 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/icons/android-32.png
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/icons/android-32.png
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/icons/android_app.png b/eclipse/plugins/com.android.ide.eclipse.ndk/icons/android_app.png
index 8ca3770..8ca3770 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/icons/android_app.png
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/icons/android_app.png
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/icons/obj16/c_app.gif b/eclipse/plugins/com.android.ide.eclipse.ndk/icons/obj16/c_app.gif
index 504ef50..504ef50 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/icons/obj16/c_app.gif
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/icons/obj16/c_app.gif
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/icons/view16/debugger_tab.gif b/eclipse/plugins/com.android.ide.eclipse.ndk/icons/view16/debugger_tab.gif
index d90a29f..d90a29f 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/icons/view16/debugger_tab.gif
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/icons/view16/debugger_tab.gif
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/icons/view16/startup_tab.gif b/eclipse/plugins/com.android.ide.eclipse.ndk/icons/view16/startup_tab.gif
index 7b3a92e..7b3a92e 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/icons/view16/startup_tab.gif
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/icons/view16/startup_tab.gif
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/plugin.xml b/eclipse/plugins/com.android.ide.eclipse.ndk/plugin.xml
index 591092f..629fd38 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/plugin.xml
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/plugin.xml
@@ -7,7 +7,7 @@
             fileVersion="4.0.0">
       </managedBuildRevision>
       <toolChain
-            configurationEnvironmentSupplier="com.android.ide.eclipse.adt.ndk.internal.build.NdkEnvSupplier"
+            configurationEnvironmentSupplier="com.android.ide.eclipse.ndk.internal.build.NdkEnvSupplier"
             id="com.android.toolchain.gcc"
             isAbstract="false"
             name="Android GCC">
@@ -19,7 +19,7 @@
          <builder
                cleanBuildTarget="clean"
                command="ndk-build"
-               commandLauncher="com.android.ide.eclipse.adt.ndk.internal.build.NdkCommandLauncher"
+               commandLauncher="com.android.ide.eclipse.ndk.internal.build.NdkCommandLauncher"
                id="com.android.builder"
                isAbstract="false"
                isVariableCaseSensitive="false"
@@ -50,7 +50,7 @@
          name="Android Per Project Profile"
          point="org.eclipse.cdt.make.core.ScannerConfigurationDiscoveryProfile">
       <scannerInfoCollector
-            class="com.android.ide.eclipse.adt.ndk.internal.discovery.NdkScannerInfoCollector"
+            class="com.android.ide.eclipse.ndk.internal.discovery.NdkScannerInfoCollector"
             scope="project">
       </scannerInfoCollector>
    </extension>
@@ -58,7 +58,7 @@
          point="org.eclipse.cdt.core.templateProcessTypes">
       <processType
             name="SetFolders"
-            processRunner="com.android.ide.eclipse.adt.ndk.internal.templates.SetFolders">
+            processRunner="com.android.ide.eclipse.ndk.internal.templates.SetFolders">
          <simple
                name="projectName">
          </simple>
@@ -71,7 +71,7 @@
       </processType>
       <processType
             name="SimpleFile"
-            processRunner="com.android.ide.eclipse.adt.ndk.internal.templates.SimpleFile">
+            processRunner="com.android.ide.eclipse.ndk.internal.templates.SimpleFile">
          <simple
                name="projectName">
          </simple>
@@ -90,7 +90,7 @@
    <extension
          point="org.eclipse.cdt.core.templates">
       <template
-            id="com.android.ide.eclipse.adt.ndk.addNdkSupport"
+            id="com.android.ide.eclipse.ndk.addNdkSupport"
             location="templates/addNdkSupport.xml"
             projectType="none">
       </template>
@@ -99,7 +99,7 @@
          point="org.eclipse.ui.preferencePages">
       <page
             category="com.android.ide.eclipse.preferences.main"
-            class="com.android.ide.eclipse.adt.ndk.internal.preferences.NdkPreferencePage"
+            class="com.android.ide.eclipse.ndk.internal.preferences.NdkPreferencePage"
             id="org.eclipse.cdt.android.page"
             name="NDK">
       </page>
@@ -108,7 +108,7 @@
          point="org.eclipse.ui.popupMenus">
       <objectContribution
             adaptable="true"
-            id="com.android.ide.eclipse.adt.ndk.projectContribution"
+            id="com.android.ide.eclipse.ndk.projectContribution"
             objectClass="org.eclipse.core.resources.IProject">
          <visibility>
             <and>
@@ -125,7 +125,7 @@
             </and>
          </visibility>
          <action
-               class="com.android.ide.eclipse.adt.ndk.internal.actions.AddNativeAction"
+               class="com.android.ide.eclipse.ndk.internal.actions.AddNativeAction"
                enablesFor="1"
                id="org.eclipse.cdt.android.action1"
                label="Add Native Support..."
@@ -136,15 +136,15 @@
    <extension
          point="org.eclipse.core.runtime.preferences">
       <initializer
-            class="com.android.ide.eclipse.adt.ndk.internal.preferences.NdkPreferenceInitializer">
+            class="com.android.ide.eclipse.ndk.internal.preferences.NdkPreferenceInitializer">
       </initializer>
    </extension>
    <extension
          point="org.eclipse.debug.core.launchConfigurationTypes">
       <launchConfigurationType
-            delegate="com.android.ide.eclipse.adt.ndk.internal.launch.NdkGdbLaunchDelegate"
+            delegate="com.android.ide.eclipse.ndk.internal.launch.NdkGdbLaunchDelegate"
             delegateName="Android ndk-gdb Launcher"
-            id="com.android.ide.eclipse.adt.ndk.debug.LaunchConfigType"
+            id="com.android.ide.eclipse.ndk.debug.LaunchConfigType"
             modes="debug"
             name="Android Native Application"
             public="true"
@@ -155,18 +155,18 @@
    <extension
          point="org.eclipse.debug.ui.launchConfigurationTypeImages">
       <launchConfigurationTypeImage
-            configTypeID="com.android.ide.eclipse.adt.ndk.debug.LaunchConfigType"
+            configTypeID="com.android.ide.eclipse.ndk.debug.LaunchConfigType"
             icon="icons/android_app.png"
-            id="com.android.ide.eclipse.adt.ndk.debug.LaunchConfigTypeImage">
+            id="com.android.ide.eclipse.ndk.debug.LaunchConfigTypeImage">
       </launchConfigurationTypeImage>
    </extension>
    <extension
          point="org.eclipse.debug.ui.launchConfigurationTabGroups">
       <launchConfigurationTabGroup
-            class="com.android.ide.eclipse.adt.ndk.internal.launch.NdkGdbLaunchConfigTabGroups"
+            class="com.android.ide.eclipse.ndk.internal.launch.NdkGdbLaunchConfigTabGroups"
             description="Android Native Application"
-            id="com.android.ide.eclipse.adt.ndk.debug.LaunchConfigTabGroup"
-            type="com.android.ide.eclipse.adt.ndk.debug.LaunchConfigType">
+            id="com.android.ide.eclipse.ndk.debug.LaunchConfigTabGroup"
+            type="com.android.ide.eclipse.ndk.debug.LaunchConfigType">
       </launchConfigurationTabGroup>
    </extension>
 
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/Activator.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/Activator.java
index 48adf11..d1936eb 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/Activator.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/Activator.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal;
+package com.android.ide.eclipse.ndk.internal;
 
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IPath;
@@ -33,7 +33,7 @@ import java.net.URL;
 public class Activator extends AbstractUIPlugin {
 
     // The plug-in ID
-    public static final String PLUGIN_ID = "com.android.ide.eclipse.adt.ndk"; //$NON-NLS-1$
+    public static final String PLUGIN_ID = "com.android.ide.eclipse.ndk"; //$NON-NLS-1$
 
     // The shared instance
     private static Activator mPlugin;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/Messages.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/Messages.java
index f8dbcb4..cd6c4a3 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/Messages.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/Messages.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal;
+package com.android.ide.eclipse.ndk.internal;
 
 import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
-    private static final String BUNDLE_NAME = "com.android.ide.eclipse.adt.ndk.internal.messages"; //$NON-NLS-1$
+    private static final String BUNDLE_NAME = "com.android.ide.eclipse.ndk.internal.messages"; //$NON-NLS-1$
 
     public static String AddNativeWizardPage_Description;
 
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/NativeAbi.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/NativeAbi.java
index ccaf412..4bf1ff1 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/NativeAbi.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/NativeAbi.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal;
+package com.android.ide.eclipse.ndk.internal;
 
 public enum NativeAbi {
     armeabi("armeabi"),
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/NdkHelper.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/NdkHelper.java
index b44f216..cdde5ae 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/NdkHelper.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/NdkHelper.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal;
+package com.android.ide.eclipse.ndk.internal;
 
 import com.android.ide.eclipse.adt.AdtPlugin;
 
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/NdkManager.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/NdkManager.java
index 8541020..95739d4 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/NdkManager.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/NdkManager.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal;
+package com.android.ide.eclipse.ndk.internal;
 
 import org.eclipse.cdt.core.templateengine.TemplateCore;
 import org.eclipse.cdt.core.templateengine.TemplateEngine;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/NdkVariables.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/NdkVariables.java
index 3e95c79..5571769 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/NdkVariables.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/NdkVariables.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal;
+package com.android.ide.eclipse.ndk.internal;
 
 /** Eclipse variables that are understood by the NDK while launching programs. */
 public class NdkVariables {
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/actions/AddNativeAction.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/actions/AddNativeAction.java
index 50580e9..11f65a4 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/actions/AddNativeAction.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/actions/AddNativeAction.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal.actions;
+package com.android.ide.eclipse.ndk.internal.actions;
 
-import com.android.ide.eclipse.adt.ndk.internal.wizards.AddNativeWizard;
+import com.android.ide.eclipse.ndk.internal.wizards.AddNativeWizard;
 
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.runtime.PlatformObject;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/build/NdkCommandLauncher.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/build/NdkCommandLauncher.java
index db3a8f1..f06cce4 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/build/NdkCommandLauncher.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/build/NdkCommandLauncher.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal.build;
+package com.android.ide.eclipse.ndk.internal.build;
 
-import com.android.ide.eclipse.adt.ndk.internal.NdkManager;
+import com.android.ide.eclipse.ndk.internal.NdkManager;
 
 import org.eclipse.cdt.core.CommandLauncher;
 import org.eclipse.core.runtime.CoreException;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/build/NdkEnvSupplier.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/build/NdkEnvSupplier.java
index 246f35f..7aff75c 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/build/NdkEnvSupplier.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/build/NdkEnvSupplier.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal.build;
+package com.android.ide.eclipse.ndk.internal.build;
 
 import org.eclipse.cdt.managedbuilder.core.IConfiguration;
 import org.eclipse.cdt.managedbuilder.envvar.IBuildEnvironmentVariable;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/discovery/NdkDiscoveredPathInfo.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/discovery/NdkDiscoveredPathInfo.java
index c6a05de..576668f 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/discovery/NdkDiscoveredPathInfo.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/discovery/NdkDiscoveredPathInfo.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal.discovery;
+package com.android.ide.eclipse.ndk.internal.discovery;
 
-import com.android.ide.eclipse.adt.ndk.internal.Activator;
+import com.android.ide.eclipse.ndk.internal.Activator;
 
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.model.CoreModel;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/discovery/NdkDiscoveryUpdater.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/discovery/NdkDiscoveryUpdater.java
index 2a84cdb..cb85112 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/discovery/NdkDiscoveryUpdater.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/discovery/NdkDiscoveryUpdater.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal.discovery;
+package com.android.ide.eclipse.ndk.internal.discovery;
 
-import com.android.ide.eclipse.adt.ndk.internal.Activator;
-import com.android.ide.eclipse.adt.ndk.internal.build.NdkCommandLauncher;
+import com.android.ide.eclipse.ndk.internal.Activator;
+import com.android.ide.eclipse.ndk.internal.build.NdkCommandLauncher;
 
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.envvar.IEnvironmentVariable;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/discovery/NdkScannerInfoCollector.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/discovery/NdkScannerInfoCollector.java
index 8ffea59..911ab73 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/discovery/NdkScannerInfoCollector.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/discovery/NdkScannerInfoCollector.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal.discovery;
+package com.android.ide.eclipse.ndk.internal.discovery;
 
 import org.eclipse.cdt.make.core.scannerconfig.IDiscoveredPathManager.IDiscoveredPathInfo;
 import org.eclipse.cdt.make.core.scannerconfig.IScannerInfoCollector3;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/launch/GdbServerTask.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/launch/GdbServerTask.java
index 7d58bd9..5c3f9a8 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/launch/GdbServerTask.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/launch/GdbServerTask.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal.launch;
+package com.android.ide.eclipse.ndk.internal.launch;
 
 import com.android.ddmlib.IDevice;
 import com.android.ddmlib.IShellOutputReceiver;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/launch/Messages.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/launch/Messages.java
index 52112cd..7f65fa5 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/launch/Messages.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/launch/Messages.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal.launch;
+package com.android.ide.eclipse.ndk.internal.launch;
 
 import org.eclipse.osgi.util.NLS;
 
 public class Messages extends NLS {
-    private static final String BUNDLE_NAME = "com.android.ide.eclipse.adt.ndk.internal.launch.messages"; //$NON-NLS-1$
+    private static final String BUNDLE_NAME = "com.android.ide.eclipse.ndk.internal.launch.messages"; //$NON-NLS-1$
     public static String NdkGdbLaunchDelegate_LaunchError_gdbserverOutput;
     public static String NdkGdbLaunchDelegate_Action_ActivityLaunch;
     public static String NdkGdbLaunchDelegate_Action_CheckAndroidDeviceVersion;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/launch/NdkDebuggerConfigTab.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/launch/NdkDebuggerConfigTab.java
index cd68b6a..e45800d 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/launch/NdkDebuggerConfigTab.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/launch/NdkDebuggerConfigTab.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal.launch;
+package com.android.ide.eclipse.ndk.internal.launch;
 
-import com.android.ide.eclipse.adt.ndk.internal.NdkVariables;
+import com.android.ide.eclipse.ndk.internal.NdkVariables;
 
 import org.eclipse.cdt.debug.core.ICDTLaunchConfigurationConstants;
 import org.eclipse.cdt.dsf.gdb.IGDBLaunchConfigurationConstants;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/launch/NdkGdbLaunchConfigTabGroups.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/launch/NdkGdbLaunchConfigTabGroups.java
index 1882ae5..6bc6bec 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/launch/NdkGdbLaunchConfigTabGroups.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/launch/NdkGdbLaunchConfigTabGroups.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal.launch;
+package com.android.ide.eclipse.ndk.internal.launch;
 
 import org.eclipse.debug.ui.AbstractLaunchConfigurationTabGroup;
 import org.eclipse.debug.ui.CommonTab;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/launch/NdkGdbLaunchDelegate.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/launch/NdkGdbLaunchDelegate.java
index a456e73..5ac5859 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/launch/NdkGdbLaunchDelegate.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/launch/NdkGdbLaunchDelegate.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal.launch;
+package com.android.ide.eclipse.ndk.internal.launch;
 
 import com.android.ddmlib.AdbCommandRejectedException;
 import com.android.ddmlib.Client;
@@ -32,9 +32,9 @@ import com.android.ide.eclipse.adt.internal.launch.LaunchConfigDelegate;
 import com.android.ide.eclipse.adt.internal.project.AndroidManifestHelper;
 import com.android.ide.eclipse.adt.internal.project.ProjectHelper;
 import com.android.ide.eclipse.adt.internal.sdk.Sdk;
-import com.android.ide.eclipse.adt.ndk.internal.NativeAbi;
-import com.android.ide.eclipse.adt.ndk.internal.NdkHelper;
-import com.android.ide.eclipse.adt.ndk.internal.NdkVariables;
+import com.android.ide.eclipse.ndk.internal.NativeAbi;
+import com.android.ide.eclipse.ndk.internal.NdkHelper;
+import com.android.ide.eclipse.ndk.internal.NdkVariables;
 import com.android.sdklib.AndroidVersion;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.xml.ManifestData;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/launch/NdkMainLaunchConfigTab.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/launch/NdkMainLaunchConfigTab.java
index 841f1dc..3db39e8 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/launch/NdkMainLaunchConfigTab.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/launch/NdkMainLaunchConfigTab.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal.launch;
+package com.android.ide.eclipse.ndk.internal.launch;
 
 import com.android.ide.eclipse.adt.internal.launch.MainLaunchConfigTab;
 import com.android.ide.eclipse.adt.internal.project.ProjectChooserHelper.IProjectChooserFilter;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/launch/messages.properties b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/launch/messages.properties
index 362e625..362e625 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/launch/messages.properties
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/launch/messages.properties
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/messages.properties b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/messages.properties
index 63400ff..63400ff 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/messages.properties
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/messages.properties
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/preferences/NdkPreferenceInitializer.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/preferences/NdkPreferenceInitializer.java
index cd16691..9c03505 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/preferences/NdkPreferenceInitializer.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/preferences/NdkPreferenceInitializer.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal.preferences;
+package com.android.ide.eclipse.ndk.internal.preferences;
 
-import com.android.ide.eclipse.adt.ndk.internal.Activator;
-import com.android.ide.eclipse.adt.ndk.internal.NdkManager;
+import com.android.ide.eclipse.ndk.internal.Activator;
+import com.android.ide.eclipse.ndk.internal.NdkManager;
 
 import org.eclipse.core.runtime.preferences.AbstractPreferenceInitializer;
 import org.eclipse.jface.preference.IPreferenceStore;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/preferences/NdkPreferencePage.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/preferences/NdkPreferencePage.java
index 6188907..e66eb40 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/preferences/NdkPreferencePage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/preferences/NdkPreferencePage.java
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal.preferences;
+package com.android.ide.eclipse.ndk.internal.preferences;
 
-import com.android.ide.eclipse.adt.ndk.internal.Activator;
-import com.android.ide.eclipse.adt.ndk.internal.Messages;
-import com.android.ide.eclipse.adt.ndk.internal.NdkManager;
+import com.android.ide.eclipse.ndk.internal.Activator;
+import com.android.ide.eclipse.ndk.internal.Messages;
+import com.android.ide.eclipse.ndk.internal.NdkManager;
 
 import org.eclipse.jface.preference.DirectoryFieldEditor;
 import org.eclipse.jface.preference.FieldEditorPreferencePage;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/templates/SetFolders.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/templates/SetFolders.java
index 26c1c5b..a7b762d 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/templates/SetFolders.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/templates/SetFolders.java
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal.templates;
+package com.android.ide.eclipse.ndk.internal.templates;
 
-import com.android.ide.eclipse.adt.ndk.internal.Messages;
+import com.android.ide.eclipse.ndk.internal.Messages;
 
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.core.model.CoreModel;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/templates/SimpleFile.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/templates/SimpleFile.java
index 874ba22..f42653c 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/templates/SimpleFile.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/templates/SimpleFile.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal.templates;
+package com.android.ide.eclipse.ndk.internal.templates;
 
-import com.android.ide.eclipse.adt.ndk.internal.Activator;
-import com.android.ide.eclipse.adt.ndk.internal.Messages;
+import com.android.ide.eclipse.ndk.internal.Activator;
+import com.android.ide.eclipse.ndk.internal.Messages;
 
 import org.eclipse.cdt.core.templateengine.TemplateCore;
 import org.eclipse.cdt.core.templateengine.process.ProcessArgument;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/templates/TemplatedInputStream.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/templates/TemplatedInputStream.java
index 241f954..3e3d28a 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/templates/TemplatedInputStream.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/templates/TemplatedInputStream.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal.templates;
+package com.android.ide.eclipse.ndk.internal.templates;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/wizards/AddNativeWizard.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/wizards/AddNativeWizard.java
index 2116eb4..0f6ac71 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/wizards/AddNativeWizard.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/wizards/AddNativeWizard.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal.wizards;
+package com.android.ide.eclipse.ndk.internal.wizards;
 
-import com.android.ide.eclipse.adt.ndk.internal.Activator;
-import com.android.ide.eclipse.adt.ndk.internal.NdkManager;
+import com.android.ide.eclipse.ndk.internal.Activator;
+import com.android.ide.eclipse.ndk.internal.NdkManager;
 
 import org.eclipse.cdt.core.CCorePlugin;
 import org.eclipse.cdt.make.core.MakeCorePlugin;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/wizards/AddNativeWizardPage.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/wizards/AddNativeWizardPage.java
index 8a715e3..79ae2f2 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/wizards/AddNativeWizardPage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/wizards/AddNativeWizardPage.java
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal.wizards;
+package com.android.ide.eclipse.ndk.internal.wizards;
 
-import com.android.ide.eclipse.adt.ndk.internal.Messages;
-import com.android.ide.eclipse.adt.ndk.internal.NdkManager;
+import com.android.ide.eclipse.ndk.internal.Messages;
+import com.android.ide.eclipse.ndk.internal.NdkManager;
 
 import org.eclipse.jface.wizard.WizardPage;
 import org.eclipse.swt.SWT;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/wizards/NdkWizardHandler.java b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/wizards/NdkWizardHandler.java
index 152816a..ccef732 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/src/com/android/ide/eclipse/adt/ndk/internal/wizards/NdkWizardHandler.java
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/src/com/android/ide/eclipse/ndk/internal/wizards/NdkWizardHandler.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.ide.eclipse.adt.ndk.internal.wizards;
+package com.android.ide.eclipse.ndk.internal.wizards;
 
 import org.eclipse.cdt.managedbuilder.core.IToolChain;
 import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/templates/addNdkSupport.xml b/eclipse/plugins/com.android.ide.eclipse.ndk/templates/addNdkSupport.xml
index 37c8814..40c7954 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/templates/addNdkSupport.xml
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/templates/addNdkSupport.xml
@@ -7,7 +7,7 @@
 	label="Add Android NDK Support"
 	description="Adds NDK support to Android Java projects"
 	help="help.html">
-	<process type="com.android.ide.eclipse.adt.ndk.SetFolders">
+	<process type="com.android.ide.eclipse.ndk.SetFolders">
 		<simple name="projectName" value="$(projectName)"/>
 		<simple-array name="sourceFolders">
 			<element value="jni"/>
@@ -17,7 +17,7 @@
 			<element value="libs"/>
 		</simple-array>
 	</process>
-	<process type="com.android.ide.eclipse.adt.ndk.SimpleFile">
+	<process type="com.android.ide.eclipse.ndk.SimpleFile">
 		<simple name="projectName" value="$(projectName)"/>
 		<complex-array name="files">
 			<element>
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/templates/resources/main.cpp b/eclipse/plugins/com.android.ide.eclipse.ndk/templates/resources/main.cpp
index 6434c66..6434c66 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/templates/resources/main.cpp
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/templates/resources/main.cpp
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/templates/resources/tAndroid.mk b/eclipse/plugins/com.android.ide.eclipse.ndk/templates/resources/tAndroid.mk
index cd9d479..cd9d479 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt.ndk/templates/resources/tAndroid.mk
+++ b/eclipse/plugins/com.android.ide.eclipse.ndk/templates/resources/tAndroid.mk