| commit | 5d2e4a2de421964aea46bb3f69296827544bb69e | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu May 12 12:17:51 2022 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 12 12:17:51 2022 +0000 |
| tree | 6c4f078c20c5db4b801d0d83ef8f02be0aed438d | |
| parent | 7478298be217f44a43ca2c77fbe107807e86b153 [diff] | |
| parent | c1edc4cadd0204d122d66f67ed41cac055522f0a [diff] |
Merge "Add service.proto jarjar rule" am: c1edc4cadd Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2069067 Change-Id: Iea3f1c002ea32903e38517745fa4cc964a89e592 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/service/jarjar-rules.txt b/service/jarjar-rules.txt index 4b21569..c1c2e9d 100644 --- a/service/jarjar-rules.txt +++ b/service/jarjar-rules.txt
@@ -105,6 +105,9 @@ # From the API shims rule com.android.networkstack.apishim.** com.android.connectivity.@0 +# From fast-pair-lite-protos +rule service.proto.** com.android.server.nearby.@0 + # From filegroup framework-connectivity-protos rule android.service.*Proto com.android.connectivity.@0