Merge "Generate additional repackaged BouncyCastle to be used by platform (separate from existing libcore version)."
diff --git a/Android.bp b/Android.bp
index 8b10685..777a526 100644
--- a/Android.bp
+++ b/Android.bp
@@ -67,6 +67,7 @@
         "//art/build/sdk",
         "//external/wycheproof",
         "//libcore",
+        "//packages/modules/ArtPrebuilt",
     ],
     apex_available: [
         "com.android.art",
@@ -99,6 +100,8 @@
     "//external/robolectric-shadows/shadows/httpclient",
     "//frameworks/opt/net/wifi/service",
     "//frameworks/opt/net/wifi/tests/wifitests",
+    "//packages/modules/Wifi/service",
+    "//packages/modules/Wifi/service/tests/wifitests",
     "//libcore",
     "//system/extras/verity",
     "//tools/security/remote_provisioning/attestation_testing",