Merge "Rename "service-nearby" to "service-nearby-pre-jarjar"" into tm-dev
diff --git a/nearby/service/Android.bp b/nearby/service/Android.bp
index 12fce04..802e2c8 100644
--- a/nearby/service/Android.bp
+++ b/nearby/service/Android.bp
@@ -44,7 +44,7 @@
 
 // Main lib for nearby services.
 java_library {
-    name: "service-nearby",
+    name: "service-nearby-pre-jarjar",
     srcs: [":nearby-service-srcs"],
 
     defaults: [
diff --git a/nearby/tests/multidevices/clients/test_support/fastpair_provider/Android.bp b/nearby/tests/multidevices/clients/test_support/fastpair_provider/Android.bp
index dc3a919..920834a 100644
--- a/nearby/tests/multidevices/clients/test_support/fastpair_provider/Android.bp
+++ b/nearby/tests/multidevices/clients/test_support/fastpair_provider/Android.bp
@@ -30,6 +30,6 @@
         "fast-pair-lite-protos",
         "framework-annotations-lib",
         "kotlin-stdlib",
-        "service-nearby",
+        "service-nearby-pre-jarjar",
     ],
 }
diff --git a/nearby/tests/robotests/Android.bp b/nearby/tests/robotests/Android.bp
index 83702f8..56c0107 100644
--- a/nearby/tests/robotests/Android.bp
+++ b/nearby/tests/robotests/Android.bp
@@ -43,7 +43,7 @@
         "androidx.mediarouter_mediarouter-nodeps",
         "error_prone_annotations",
         "mockito-robolectric-prebuilt",
-        "service-nearby",
+        "service-nearby-pre-jarjar",
         "truth-prebuilt",
         "robolectric_android-all-stub",
         "Robolectric_all-target",
diff --git a/nearby/tests/unit/Android.bp b/nearby/tests/unit/Android.bp
index 851dd08..9b35452 100644
--- a/nearby/tests/unit/Android.bp
+++ b/nearby/tests/unit/Android.bp
@@ -41,7 +41,7 @@
         "libprotobuf-java-lite",
         "mockito-target-extended-minus-junit4",
         "platform-test-annotations",
-        "service-nearby",
+        "service-nearby-pre-jarjar",
         "truth-prebuilt",
         // "Robolectric_all-target",
     ],