commit 51935fc21e5d5db01ee09a6889f6ca0fabe6bd62
author Remi NGUYEN VAN <reminv@google.com> Fri Jan 07 13:18:54 2022 +0900
committer Remi NGUYEN VAN <reminv@google.com> Wed Jan 26 18:03:22 2022 +0900
tree b90d8d3c1f29fec478e8298ef9089424e1cdb4b9
parent 47fce47195ea2d3b7db320a0a437fec75f69ef36

Add nearby to tethering apex

Nearby will be merged together with the tethering/connectivity APEX, so
that module maintenance efforts can be reduced, and the two codebases
can evolve the interfaces that they expose to each other over time.

Bug: 189355156
Test: m
Ignore-AOSP-First: Nearby is not yet in AOSP. This introduces minimal
                   unavoidable merge conflicts until it is merged there.
Change-Id: If4b40689a257d2806f895cd2dded97fc699adc5f

service/Android.bp

diff --git a/service/Android.bp b/service/Android.bp
index 975dcb5..7d5d7b3 100644
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -150,6 +150,7 @@
     static_libs: [
         "service-connectivity-pre-jarjar",
         "service-connectivity-tiramisu-pre-jarjar",
+        "service-nearby",
     ],
     jarjar_rules: "jarjar-rules.txt",
     apex_available: [