From b6cde3d2dcac2ca97f2e2aa7626861e4d38edab9 Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Thu, 10 Mar 2022 04:32:15 +0000 Subject: [PATCH] Rename "service-nearby" to "service-nearby-pre-jarjar" Change-Id: I99ef6ee39e89f99b0878909e2d1f2962df513d1a Test: unit test Bug: 217115866 Merged-In: I80c8538372659a04145178fcc8e1af98e78e3681 --- nearby/Android.bp | 2 +- service-t/Android.bp | 2 +- service/Android.bp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nearby/Android.bp b/nearby/Android.bp index b968f5d686..fb4e3cd6c3 100644 --- a/nearby/Android.bp +++ b/nearby/Android.bp @@ -30,7 +30,7 @@ filegroup { java_library { - name: "service-nearby", + name: "service-nearby-pre-jarjar", srcs: ["service-src/**/*.java"], sdk_version: "module_current", min_sdk_version: "30", diff --git a/service-t/Android.bp b/service-t/Android.bp index 3d9820dd47..3146a93892 100644 --- a/service-t/Android.bp +++ b/service-t/Android.bp @@ -38,7 +38,7 @@ java_library { "framework-connectivity-t-pre-jarjar", "framework-tethering.stubs.module_lib", "service-connectivity-pre-jarjar", - "service-nearby", + "service-nearby-pre-jarjar", "unsupportedappusage", ], static_libs: [ diff --git a/service/Android.bp b/service/Android.bp index a4d8d64b85..aed4b1e7b3 100644 --- a/service/Android.bp +++ b/service/Android.bp @@ -159,7 +159,7 @@ java_library { static_libs: [ "service-connectivity-pre-jarjar", "service-connectivity-tiramisu-pre-jarjar", - "service-nearby", + "service-nearby-pre-jarjar", ], jarjar_rules: ":connectivity-jarjar-rules", apex_available: [