1 files changed, 11 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index 84f3fad7306b..75274eb84f63 100644
--- a/Android.bp
+++ b/Android.bp
@@ -508,6 +508,13 @@ java_library {
     srcs: [":framework-all-sources"],
     installable: false,
     apex_available: ["//apex_available:platform"],
+    visibility: [
+        // DO NOT ADD ANY MORE ENTRIES TO THIS LIST
+        "//external/robolectric-shadows:__subpackages__",
+        "//frameworks/base/packages/Tethering/common/TetheringLib:__subpackages__",
+        "//frameworks/layoutlib:__subpackages__",
+        "//frameworks/opt/net/ike:__subpackages__",
+    ],
 }
 
 java_library {
@@ -520,7 +527,6 @@ java_library {
     ],
     installable: false,
     plugins: [
-        "unsupportedappusage-annotation-processor",
         "compat-changeid-annotation-processor",
     ],
 }
@@ -946,13 +952,13 @@ python_defaults {
     name: "base_default",
     version: {
         py2: {
-            enabled: true,
-            embedded_launcher: true,
-        },
-        py3: {
             enabled: false,
             embedded_launcher: false,
         },
+        py3: {
+            enabled: true,
+            embedded_launcher: true,
+        },
     },
 }