diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/Android.bp b/Android.bp index b68312b47c46..a5cc89cd0ea1 100644 --- a/Android.bp +++ b/Android.bp @@ -49,6 +49,9 @@ java_defaults { "rs/java/**/*.java", ":framework-javastream-protos", + // TODO: Resolve circular library dependency and remove media1-srcs and mediasession2-srcs + ":media1-srcs", + ":mediasession2-srcs", "core/java/android/accessibilityservice/IAccessibilityServiceConnection.aidl", "core/java/android/accessibilityservice/IAccessibilityServiceClient.aidl", @@ -471,14 +474,11 @@ java_defaults { "media/java/android/media/IAudioRoutesObserver.aidl", "media/java/android/media/IAudioService.aidl", "media/java/android/media/IAudioServerStateDispatcher.aidl", - "media/java/android/media/IMediaController2.aidl", "media/java/android/media/IMediaHTTPConnection.aidl", "media/java/android/media/IMediaHTTPService.aidl", "media/java/android/media/IMediaResourceMonitor.aidl", "media/java/android/media/IMediaRouterClient.aidl", "media/java/android/media/IMediaRouterService.aidl", - "media/java/android/media/IMediaSession2.aidl", - "media/java/android/media/IMediaSession2Service.aidl", "media/java/android/media/IMediaScannerListener.aidl", "media/java/android/media/IMediaScannerService.aidl", "media/java/android/media/IPlaybackConfigDispatcher.aidl", @@ -504,11 +504,7 @@ java_defaults { "media/java/android/media/session/ICallback.aidl", "media/java/android/media/session/IOnMediaKeyListener.aidl", "media/java/android/media/session/IOnVolumeKeyLongPressListener.aidl", - "media/java/android/media/session/ISession.aidl", "media/java/android/media/session/ISession2TokensListener.aidl", - "media/java/android/media/session/ISessionCallback.aidl", - "media/java/android/media/session/ISessionController.aidl", - "media/java/android/media/session/ISessionControllerCallback.aidl", "media/java/android/media/session/ISessionManager.aidl", "media/java/android/media/soundtrigger/ISoundTriggerDetectionService.aidl", "media/java/android/media/soundtrigger/ISoundTriggerDetectionServiceClient.aidl", @@ -523,8 +519,6 @@ java_defaults { "media/java/android/media/tv/ITvInputSessionCallback.aidl", "media/java/android/media/tv/ITvRemoteProvider.aidl", "media/java/android/media/tv/ITvRemoteServiceInput.aidl", - "media/java/android/service/media/IMediaBrowserService.aidl", - "media/java/android/service/media/IMediaBrowserServiceCallbacks.aidl", "telecomm/java/com/android/internal/telecom/ICallRedirectionAdapter.aidl", "telecomm/java/com/android/internal/telecom/ICallRedirectionService.aidl", "telecomm/java/com/android/internal/telecom/ICallScreeningAdapter.aidl", @@ -637,6 +631,7 @@ java_defaults { "wifi/java/android/net/wifi/ISoftApCallback.aidl", "wifi/java/android/net/wifi/ITrafficStateCallback.aidl", "wifi/java/android/net/wifi/IWifiManager.aidl", + "wifi/java/android/net/wifi/IWifiUsabilityStatsListener.aidl", "wifi/java/android/net/wifi/aware/IWifiAwareDiscoverySessionCallback.aidl", "wifi/java/android/net/wifi/aware/IWifiAwareEventCallback.aidl", "wifi/java/android/net/wifi/aware/IWifiAwareMacAddressProvider.aidl", @@ -691,6 +686,7 @@ java_defaults { "location/java", "lowpan/java", "media/java", + "media/apex/java", "media/mca/effect/java", "media/mca/filterfw/java", "media/mca/filterpacks/java", @@ -723,8 +719,6 @@ java_defaults { exclude_srcs: [ // See comment on framework-atb-backward-compatibility module below "core/java/android/content/pm/AndroidTestBaseUpdater.java", - // See comment on framework-oahl-backward-compatibility module below - "core/java/android/content/pm/OrgApacheHttpLegacyUpdater.java", ], no_framework_libs: true, @@ -732,6 +726,8 @@ java_defaults { "ext", ], + jarjar_rules: ":framework-hidl-jarjar", + static_libs: [ "apex_aidl_interface-java", "networkstack-aidl-interfaces-java", @@ -749,6 +745,7 @@ java_defaults { "android.hardware.tv.input-V1.0-java-constants", "android.hardware.usb-V1.0-java-constants", "android.hardware.usb-V1.1-java-constants", + "android.hardware.usb-V1.2-java-constants", "android.hardware.vibrator-V1.0-java", "android.hardware.vibrator-V1.1-java", "android.hardware.vibrator-V1.2-java", @@ -791,6 +788,11 @@ filegroup { ], } +filegroup { + name: "framework-hidl-jarjar", + srcs: ["jarjar_rules_hidl.txt"], +} + java_library { name: "framework", defaults: ["framework-defaults"], @@ -801,11 +803,7 @@ java_library { name: "framework-annotation-proc", defaults: ["framework-defaults"], // Use UsedByApps annotation processor - annotation_processors: ["unsupportedappusage-annotation-processor"], - // b/25860419: annotation processors must be explicitly specified for grok - annotation_processor_classes: [ - "android.processor.unsupportedappusage.UsedByAppsProcessor", - ], + plugins: ["unsupportedappusage-annotation-processor"], } // A host library including just UnsupportedAppUsage.java so that the annotation @@ -1264,7 +1262,7 @@ stubs_defaults { ":non_openjdk_javadoc_files", ":android_icu4j_src_files_for_docs", ":conscrypt_public_api_files", - ":media2-srcs", + ":media-srcs-without-aidls", "test-mock/src/**/*.java", "test-runner/src/**/*.java", ], @@ -1326,7 +1324,7 @@ stubs_defaults { ":non_openjdk_javadoc_files", ":android_icu4j_src_files_for_docs", ":conscrypt_public_api_files", - ":media2-srcs", + ":media-srcs-without-aidls", ], srcs_lib: "framework", srcs_lib_whitelist_dirs: frameworks_base_subdirs, @@ -1772,6 +1770,7 @@ filegroup { name: "framework-media-annotation-srcs", srcs: [ "core/java/android/annotation/CallbackExecutor.java", + "core/java/android/annotation/CallSuper.java", "core/java/android/annotation/DrawableRes.java", "core/java/android/annotation/IntDef.java", "core/java/android/annotation/LongDef.java", @@ -1780,6 +1779,7 @@ filegroup { "core/java/android/annotation/RequiresPermission.java", "core/java/android/annotation/SdkConstant.java", "core/java/android/annotation/StringDef.java", + "core/java/android/annotation/SystemApi.java", "core/java/android/annotation/TestApi.java", "core/java/android/annotation/UnsupportedAppUsage.java", "core/java/com/android/internal/annotations/GuardedBy.java", |