commit ffe871697acc382457cbab788e453f43a00965e3
author Chiachang Wang <chiachangwang@google.com> Fri Feb 26 17:36:52 2021 +0800
committer Lorenzo Colitti <lorenzo@google.com> Mon Mar 01 16:18:40 2021 +0900
tree 4dd95cef6c513d65b677b472a1921ee1d99afe84
parent 01cd643028b64999d5b5956d179b65c898ddb76e

Build API 31 shims against module_current.

This is needed to ensure the shims (and everything that uses
them, which soon will include other modules and CTS tests) can
access module_lib APIs.

This requires explicitly depending on framework-connectivity,
because module_current does not include the API stubs.

Bug: 167645754
Test: m NetworkStack NetworkStackNext
Change-Id: Ifbcbde5a49b18a40890b887544d72972d7f42857

Android.bp

diff --git a/Android.bp b/Android.bp
index d7ad77d..83bcd91 100644
--- a/Android.bp
+++ b/Android.bp
@@ -121,8 +121,9 @@
         "NetworkStackShimsCommon",
         "NetworkStackApi29Shims",
         "NetworkStackApi30Shims",
+        "framework-connectivity",
     ],
-    sdk_version: "system_current",
+    sdk_version: "module_current",
     visibility: ["//visibility:private"],
 }
 
@@ -138,7 +139,7 @@
         "NetworkStackApi30Shims",
         "NetworkStackApi31Shims",
     ],
-    sdk_version: "system_current",
+    sdk_version: "module_current",
     visibility: ["//visibility:private"],
 }