diff options
| -rw-r--r-- | apex/Android.bp | 8 | ||||
| -rw-r--r-- | apex/framework/Android.bp | 5 |
2 files changed, 9 insertions, 4 deletions
diff --git a/apex/Android.bp b/apex/Android.bp index 96e88dd..986e74a 100644 --- a/apex/Android.bp +++ b/apex/Android.bp @@ -23,9 +23,9 @@ package { sdk { name: "media-module-sdk", - bootclasspath_fragments: ["com.android.media-bootclasspath-fragment"], - systemserverclasspath_fragments: ["com.android.media-systemserverclasspath-fragment"], - java_sdk_libs: [ - "framework-media", + apexes: [ + // Adds exportable dependencies of the APEX to the sdk, + // e.g. *classpath_fragments. + "com.android.media", ], } 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 @@ java_library { // 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", ], } |