commit a8f97bdd8a6be5982deeafa53711f87b4b054f28
author Jean Chalard <jchalard@google.com> Thu Jan 27 07:36:53 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jan 27 07:36:53 2022 +0000
tree 6615ba5d3f89ed1a7ae876899b1a2a81e7a9a705
parent 16fdb5f746c29cce30007024e706a57699b7cff1
parent 08a7aeb7a45de6228c8dedbec580be38efe78b4e

Merge "Let the connectivity module see the shims"

Android.bp

diff --git a/Android.bp b/Android.bp
index e22adb3..8555256 100644
--- a/Android.bp
+++ b/Android.bp
@@ -168,6 +168,7 @@
         "NetworkStackApi29Shims",
         "NetworkStackApi30Shims",
         "NetworkStackApi31Shims",
+        "framework-bluetooth",
         "framework-connectivity",
         "framework-tethering",
     ],

tests/unit/Android.bp

diff --git a/tests/unit/Android.bp b/tests/unit/Android.bp
index 9f40ee9..f9682ec 100644
--- a/tests/unit/Android.bp
+++ b/tests/unit/Android.bp
@@ -47,6 +47,7 @@
         "libnetworkstackutilsjni",
     ],
     jni_uses_sdk_apis: true,
+    exclude_kotlinc_generated_files: false,
 }
 
 // Tests for NetworkStackNext.