commit 1d1efa9ad6f6446a566d84f529cadac865dd9268
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Mar 10 07:28:25 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Mar 10 07:28:25 2022 +0000
tree 319dea1cb48f70fe86a9b13dd9d2dbe9cc96f10b
parent 3c2268f9883730e9d19f76d30bfe8e70b61b7d47
parent 92b704071442b63f5646e4b70b03d22c30c6b0c1

Merge "Rename "service-nearby" to "service-nearby-pre-jarjar"" into tm-dev

service-t/Android.bp

diff --git a/service-t/Android.bp b/service-t/Android.bp
index 3d9820d..3146a93 100644
--- a/service-t/Android.bp
+++ b/service-t/Android.bp
@@ -38,7 +38,7 @@
         "framework-connectivity-t-pre-jarjar",
         "framework-tethering.stubs.module_lib",
         "service-connectivity-pre-jarjar",
-        "service-nearby",
+        "service-nearby-pre-jarjar",
         "unsupportedappusage",
     ],
     static_libs: [

service/Android.bp

diff --git a/service/Android.bp b/service/Android.bp
index 3e9ef1a..744f9ba 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -159,7 +159,7 @@
     static_libs: [
         "service-connectivity-pre-jarjar",
         "service-connectivity-tiramisu-pre-jarjar",
-        "service-nearby",
+        "service-nearby-pre-jarjar",
     ],
     jarjar_rules: ":connectivity-jarjar-rules",
     apex_available: [