diff options
| author | Roshan Pius <rpius@google.com> | 2019-10-18 09:14:36 -0700 |
|---|---|---|
| committer | Roshan Pius <rpius@google.com> | 2019-10-18 12:32:50 -0700 |
| commit | 31114a118ad465f60ea812bcf27bffd7dc8b4347 (patch) | |
| tree | 320f9e8dc58780b9d907341cee7ca01db584107c | |
| parent | 4b439b9cfa18bafdaf97001f9ab795a3090cdb00 (diff) | |
WifiStack: Statically link bouncycastle library
Bug: 142067860
Test: make InProcessWifiStack
a) Ensured that @hide accesses related to bouncycastle library are gone.
b) APK size did not increase increase after proguard optimization (Can
see the actual increase when proguard optimization is turned off).
Change-Id: I96b204a390ebb4ca53f57bdc4c451c6fd5b9b4e9
| -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 |