diff --git a/apex/framework/Android.bp b/apex/framework/Android.bp
index 7bba456..e93e713 100644
--- a/apex/framework/Android.bp
+++ b/apex/framework/Android.bp
@@ -51,6 +51,11 @@
         // This MUST not be used for compilation within the media module, use
         // framework-media.impl instead.
         "//frameworks/av/apex:__subpackages__",
+
+        // DO NOT REMOVE: Legacy visibility, needed for snapshots that are
+        // generated for the S build.
+        "//frameworks/base",
+        "//frameworks/base/apex/media/service",
     ],
 }