From 2af9a9ff91a703371dbebf1d466c9a00e17fb771 Mon Sep 17 00:00:00 2001
From: Xavier Ducrohet <xav@android.com>
Date: Sat, 16 Mar 2013 15:46:37 -0700
Subject: Add BouncyCastle to adt-base.

This is now needed by sdklib for signing.

Change-Id: I804d8d2ca2d5a939c24e977ea48a2a5ad4fa7501
---
 eclipse/plugins/com.android.ide.eclipse.base/.classpath           | 2 ++
 eclipse/plugins/com.android.ide.eclipse.base/META-INF/MANIFEST.MF | 4 +++-
 eclipse/scripts/create_all_symlinks.sh                            | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'eclipse')

diff --git a/eclipse/plugins/com.android.ide.eclipse.base/.classpath b/eclipse/plugins/com.android.ide.eclipse.base/.classpath
index adeb83c09..c0ddc3c97 100644
--- a/eclipse/plugins/com.android.ide.eclipse.base/.classpath
+++ b/eclipse/plugins/com.android.ide.eclipse.base/.classpath
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="libs/bcpkix-jdk15on-1.48.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/bcprov-jdk15on-1.48.jar"/>
 	<classpathentry exported="true" kind="lib" path="libs/dvlib.jar" sourcepath="/dvlib"/>
 	<classpathentry exported="true" kind="lib" path="libs/common.jar" sourcepath="/common"/>
 	<classpathentry exported="true" kind="lib" path="libs/commons-codec-1.4.jar"/>
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 6cacbc9a0..0a01a5471 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
@@ -21,7 +21,9 @@ Bundle-ClassPath: .,
  libs/sdklib.jar,
  libs/sdkstats.jar,
  libs/dvlib.jar,
- libs/sdk-common.jar
+ libs/sdk-common.jar,
+ libs/bcpkix-jdk15on-1.48.jar,
+ libs/bcprov-jdk15on-1.48.jar
 Export-Package: com.android,
  com.android.annotations,
  com.android.dvlib,
diff --git a/eclipse/scripts/create_all_symlinks.sh b/eclipse/scripts/create_all_symlinks.sh
index 7bc5d380d..6638e384b 100755
--- a/eclipse/scripts/create_all_symlinks.sh
+++ b/eclipse/scripts/create_all_symlinks.sh
@@ -118,7 +118,9 @@ BASE_PLUGIN_PREBUILTS="\
     prebuilts/tools/common/http-client/commons-codec-1.4.jar \
     prebuilts/tools/common/http-client/httpclient-4.1.1.jar \
     prebuilts/tools/common/http-client/httpcore-4.1.jar \
-    prebuilts/tools/common/http-client/httpmime-4.1.1.jar"
+    prebuilts/tools/common/http-client/httpmime-4.1.1.jar \
+    prebuilts/tools/common/m2/repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar \
+    prebuilts/tools/common/m2/repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar"
 
 LIBS="$LIBS $BASE_PLUGIN_LIBS"
 CP_FILES="$CP_FILES @:$BASE_PLUGIN_DEST $BASE_PLUGIN_LIBS $BASE_PLUGIN_PREBUILTS"
-- 
cgit v1.2.3