diff options
| author | Roshan Pius <rpius@google.com> | 2019-11-04 15:06:47 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-11-04 15:06:47 +0000 |
| commit | 2b0d1a8a196d428bac014eb296f6230bfc9f3ccd (patch) | |
| tree | 0064e5cf7cc92b7521ada71ff464e3963c48356e | |
| parent | f19e1891bc23d7a9522b15bac73ec657abfe56e9 (diff) | |
| parent | c587813330ab5fefd9171fa3ffc6d2cabe54abef (diff) | |
Merge "WifiStack: Statically link protobuf lite"
| -rw-r--r-- | service/Android.bp | 6 | ||||
| -rw-r--r-- | service/jarjar-rules-shared.txt | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/service/Android.bp b/service/Android.bp index a212fc62a..ade028eae 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -85,7 +85,6 @@ java_library { libs: [ "error_prone_annotations", - "libprotobuf-java-lite", "jsr305", "services", ], @@ -106,6 +105,11 @@ java_library { "androidx.annotation_annotation", "bouncycastle-unbundled", "ksoap2", + // Note: libprotobuf-java-lite uses a few core platform APIs which + // does show up as @hide API usage. But, this can be safely ignored + // since the library uses reflection to ensure that the OS does provide + // the necessary core platform APIs. + "libprotobuf-java-lite", "libnanohttpd", "services.net", "services.wifi", diff --git a/service/jarjar-rules-shared.txt b/service/jarjar-rules-shared.txt index 8a6435a1a..bdfb825ab 100644 --- a/service/jarjar-rules-shared.txt +++ b/service/jarjar-rules-shared.txt @@ -17,5 +17,7 @@ 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 +# Use our statically linked bouncy castle library rule org.bouncycastle.** com.android.server.wifi.bouncycastle.@1 +# Use our statically linked protobuf library +rule com.google.protobuf.** com.android.server.wifi.protobuf.@1 |