aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiva Velusamy <vsiva@google.com>2014-07-22 18:14:28 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-07-22 18:14:28 +0000
commit97c86dcf5cce4580c01353e2be39a4f31dec79fd (patch)
treead9771d0117e381af02e080fdc0887bfc4bcc254
parent4f8c939e96f898c70901ca7d13a1e9cb09232190 (diff)
parentd4ce9eb0eddd3faf21dbcc66c1764113f242d66b (diff)
downloadsdk-97c86dcf5cce4580c01353e2be39a4f31dec79fd.zip
sdk-97c86dcf5cce4580c01353e2be39a4f31dec79fd.tar.gz
sdk-97c86dcf5cce4580c01353e2be39a4f31dec79fd.tar.bz2
Merge "Add NDK plugin to ADT package feature" into idea133
automerge: d4ce9eb * commit 'd4ce9eb0eddd3faf21dbcc66c1764113f242d66b': Add NDK plugin to ADT package feature
-rw-r--r--eclipse/features/com.android.ide.eclipse.adt.package/feature.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml b/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml
index c02162f..f6a3037 100644
--- a/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml
+++ b/eclipse/features/com.android.ide.eclipse.adt.package/feature.xml
@@ -25,6 +25,7 @@
<import plugin="com.android.ide.eclipse.gldebugger" version="22.3.0" match="greaterOrEqual"/>
<import plugin="com.android.ide.eclipse.hierarchyviewer" version="22.3.0" match="greaterOrEqual"/>
<import plugin="com.android.ide.eclipse.traceview" version="22.3.0" match="greaterOrEqual"/>
+ <import plugin="com.android.ide.eclipse.ndk" version="22.3.0" match="greaterOrEqual"/>
<import plugin="overlay.com.android.ide.eclipse.adt.overlay"/>
<import feature="org.eclipse.equinox.p2.user.ui"/>
<import feature="org.eclipse.platform"/>