diff options
| author | Xavier Ducrohet <xav@google.com> | 2014-12-13 05:25:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-13 05:25:43 +0000 |
| commit | fd64e3e5e0674f953638a3ced958731c2f88bb31 (patch) | |
| tree | 3f025d11ec2c6af132cb07412afbe70151bdb7b8 /eclipse | |
| parent | 9a6d82742e168168d1af1beff0a4fe73f72bcb5c (diff) | |
| parent | 841a676f3b488d99e6ed9d0defa022c0fdee4941 (diff) | |
| download | sdk-fd64e3e5e0674f953638a3ced958731c2f88bb31.zip sdk-fd64e3e5e0674f953638a3ced958731c2f88bb31.tar.gz sdk-fd64e3e5e0674f953638a3ced958731c2f88bb31.tar.bz2 | |
Merge "Fix Eclipse build." into studio-1.1-dev
Diffstat (limited to 'eclipse')
| -rw-r--r-- | eclipse/build.gradle | 1 | ||||
| -rw-r--r-- | eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/eclipse/build.gradle b/eclipse/build.gradle index b1a210e..dd1db05 100644 --- a/eclipse/build.gradle +++ b/eclipse/build.gradle @@ -46,6 +46,7 @@ def artifacts = [ 'lint-api' : "com.android.tools.lint:lint-api:$ext.baseVersion", 'lint-checks' : "com.android.tools.lint:lint-checks:$ext.baseVersion", 'asset-studio' : "com.android.tools:asset-studio:$ext.baseVersion", + 'annotations' : "com.android.tools:annotations:$ext.baseVersion", 'common' : "com.android.tools:common:$ext.baseVersion", 'dvlib' : "com.android.tools:dvlib:$ext.baseVersion", 'hierarchyviewer2lib' : "com.android.tools:hierarchyviewer2lib:$ext.baseVersion", diff --git a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF index 45fb1e8..c8076d6 100644 --- a/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF +++ b/eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF @@ -8,6 +8,7 @@ Require-Bundle: org.eclipse.ui, Bundle-ActivationPolicy: lazy Bundle-Vendor: The Android Open Source Project Bundle-ClassPath: ., + libs/annotations.jar, libs/common.jar, libs/commons-codec-1.4.jar, libs/commons-compress-1.0.jar, |