summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNarayan Kamath <narayan@google.com>2018-02-27 15:15:38 +0000
committerNarayan Kamath <narayan@google.com>2018-02-27 15:20:08 +0000
commitdc738435929d96f4012514e94c2cb0e4c5efffb4 (patch)
treec0d1051ef6e660cf1e58e3bd6667857fc2bb734d
parentda99ea9b0b28db8392ea41bc495623942a99e39d (diff)
downloadbouncycastle-dc738435929d96f4012514e94c2cb0e4c5efffb4.tar.gz
Remove dependency on conscrypt from build rules.
Bouncycastle doesn't depend on conscrypt at build time. The only reference to conscrypt is via a reflective access to instantiate one of its private digest classes, with a fallback to BC if the class isn't found. It doesn't make sense to declare this dependency because : - BC can function normally even if this dependency doesn't exist. - There's no guarantee that the reflective access succeeds - it's only guaranteed to do so if called if the caller code is present in the bootclasspath. Test: make Bug: 73635411 Change-Id: Iefa7af6a43d61a3ed4ad59c9d7b22b32a89236df
-rw-r--r--Android.bp6
1 files changed, 0 insertions, 6 deletions
diff --git a/Android.bp b/Android.bp
index ffd2d704..357fed34 100644
--- a/Android.bp
+++ b/Android.bp
@@ -68,7 +68,6 @@ java_library_static {
],
},
},
- libs: ["conscrypt"],
no_framework_libs: true,
java_version: "1.7",
}
@@ -78,7 +77,6 @@ java_library {
defaults: ["bouncycastle-defaults"],
static_libs: ["bouncycastle-nojarjar"],
- libs: ["conscrypt"],
no_framework_libs: true,
java_version: "1.7",
@@ -97,7 +95,6 @@ java_library {
defaults: ["bouncycastle-defaults"],
static_libs: ["bouncycastle-nojarjar"],
- libs: ["conscrypt"],
no_framework_libs: true,
jarjar_rules: "jarjar-rules.txt",
java_version: "1.7",
@@ -130,7 +127,6 @@ java_library_static {
java_version: "1.7",
libs: [
"bouncycastle-nojarjar",
- "conscrypt",
],
}
@@ -139,7 +135,6 @@ java_library_static {
defaults: ["bouncycastle-defaults"],
static_libs: ["bouncycastle-bcpkix-nojarjar"],
- libs: ["conscrypt"],
no_framework_libs: true,
java_version: "1.7",
@@ -164,7 +159,6 @@ java_library_static {
libs: [
"bouncycastle-nojarjar",
"bouncycastle-bcpkix-nojarjar",
- "conscrypt",
],
}