diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-10-18 22:13:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-10-18 22:13:28 +0000 |
| commit | 2b9e503f8053a9538a00fd347c67142e3dbcbdb0 (patch) | |
| tree | 320f9e8dc58780b9d907341cee7ca01db584107c | |
| parent | af3c8fa7778f1b56e7cb54238838f98c83b17937 (diff) | |
| parent | 31114a118ad465f60ea812bcf27bffd7dc8b4347 (diff) | |
Merge "WifiStack: Statically link bouncycastle library"
| -rw-r--r-- | service/Android.bp | 1 | ||||
| -rw-r--r-- | service/jarjar-rules-shared.txt | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/service/Android.bp b/service/Android.bp index ece389432..526e66782 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -104,6 +104,7 @@ java_library { "android.hardware.wifi.supplicant-V1.3-java", "android.hidl.manager-V1.2-java", "androidx.annotation_annotation", + "bouncycastle-unbundled", "wifi_service_proto", "ksoap2", "libnanohttpd", diff --git a/service/jarjar-rules-shared.txt b/service/jarjar-rules-shared.txt index eb843d26d..bcb36a868 100644 --- a/service/jarjar-rules-shared.txt +++ b/service/jarjar-rules-shared.txt @@ -16,3 +16,6 @@ rule android.util.LocalLog* com.android.server.wifi.util.LocalLog@1 rule android.util.Rational* com.android.server.wifi.util.Rational@1 rule android.util.proto.ProtoStream* com.android.server.wifi.util.proto.ProtoStream@1 rule android.util.proto.ProtoOutputStream* com.android.server.wifi.util.proto.ProtoOutputStream@1 + +# Use our statically linked bouncy castle version +rule com.android.org.bouncycastle.asn1** com.android.server.wifi.bouncycastle.asn1@1 |