diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 98 |
1 files changed, 58 insertions, 40 deletions
diff --git a/Android.bp b/Android.bp index 8e3ae83a1aa9..190e80d85a28 100644 --- a/Android.bp +++ b/Android.bp @@ -26,7 +26,35 @@ // READ ME: ######################################################## java_defaults { + name: "framework-aidl-export-defaults", + + aidl: { + export_include_dirs: [ + // From build/make/core/pathmap.mk FRAMEWORK_BASE_SUBDIRS + "core/java", + "graphics/java", + "location/java", + "lowpan/java", + "media/java", + "media/apex/java", + "media/mca/effect/java", + "media/mca/filterfw/java", + "media/mca/filterpacks/java", + "drm/java", + "opengl/java", + "sax/java", + "telecomm/java", + "telephony/java", + "wifi/java", + "keystore/java", + "rs/java", + ], + }, +} + +java_defaults { name: "framework-defaults", + defaults: ["framework-aidl-export-defaults"], installable: true, srcs: [ @@ -78,9 +106,6 @@ java_defaults { "core/java/android/app/ISearchManagerCallback.aidl", "core/java/android/app/IServiceConnection.aidl", "core/java/android/app/IStopUserCallback.aidl", - "core/java/android/app/job/IJobCallback.aidl", - "core/java/android/app/job/IJobScheduler.aidl", - "core/java/android/app/job/IJobService.aidl", "core/java/android/app/ITransientNotification.aidl", "core/java/android/app/IUidObserver.aidl", "core/java/android/app/IUiAutomationConnection.aidl", @@ -136,7 +161,6 @@ java_defaults { "core/java/android/content/pm/IDexModuleRegisterCallback.aidl", "core/java/android/content/pm/ILauncherApps.aidl", "core/java/android/content/pm/IOnAppsChangedListener.aidl", - "core/java/android/content/pm/IOnPermissionsChangeListener.aidl", "core/java/android/content/pm/IOtaDexopt.aidl", "core/java/android/content/pm/IPackageDataObserver.aidl", "core/java/android/content/pm/IPackageDeleteObserver.aidl", @@ -278,7 +302,9 @@ java_defaults { "core/java/android/os/storage/IStorageEventListener.aidl", "core/java/android/os/storage/IStorageShutdownObserver.aidl", "core/java/android/os/storage/IObbActionListener.aidl", + "core/java/android/permission/IOnPermissionsChangeListener.aidl", "core/java/android/permission/IPermissionController.aidl", + "core/java/android/permission/IPermissionManager.aidl", ":keystore_aidl", "core/java/android/security/keymaster/IKeyAttestationApplicationIdProvider.aidl", "core/java/android/service/appprediction/IPredictionService.aidl", @@ -421,6 +447,7 @@ java_defaults { "core/java/com/android/internal/appwidget/IAppWidgetHost.aidl", "core/java/com/android/internal/backup/IBackupTransport.aidl", "core/java/com/android/internal/backup/IObbBackupService.aidl", + "core/java/com/android/internal/infra/IAndroidFuture.aidl", "core/java/com/android/internal/inputmethod/IInputContentUriToken.aidl", "core/java/com/android/internal/inputmethod/IInputMethodPrivilegedOperations.aidl", "core/java/com/android/internal/inputmethod/IMultiClientInputMethod.aidl", @@ -481,6 +508,10 @@ java_defaults { "media/java/android/media/IMediaHTTPConnection.aidl", "media/java/android/media/IMediaHTTPService.aidl", "media/java/android/media/IMediaResourceMonitor.aidl", + "media/java/android/media/IMediaRoute2Provider.aidl", + "media/java/android/media/IMediaRoute2ProviderClient.aidl", + "media/java/android/media/IMediaRouter2Client.aidl", + "media/java/android/media/IMediaRouter2Manager.aidl", "media/java/android/media/IMediaRouterClient.aidl", "media/java/android/media/IMediaRouterService.aidl", "media/java/android/media/IMediaScannerListener.aidl", @@ -689,34 +720,10 @@ java_defaults { "core/java/com/android/server/DropboxLogTags.logtags", "core/java/org/chromium/arc/EventLogTags.logtags", - ":apex-properties", - ":platform-properties", - ":framework-statslog-gen", ], aidl: { - export_include_dirs: [ - // From build/make/core/pathmap.mk FRAMEWORK_BASE_SUBDIRS - "core/java", - "graphics/java", - "location/java", - "lowpan/java", - "media/java", - "media/apex/java", - "media/mca/effect/java", - "media/mca/filterfw/java", - "media/mca/filterpacks/java", - "drm/java", - "opengl/java", - "sax/java", - "telecomm/java", - "telephony/java", - "wifi/java", - "keystore/java", - "rs/java", - ], - include_dirs: [ "system/update_engine/binder_bindings", "frameworks/native/aidl/binder", @@ -780,6 +787,9 @@ java_defaults { "android.hardware.vibrator-V1.3-java", "android.hardware.wifi-V1.0-java-constants", "devicepolicyprotosnano", + + "com.android.sysprop.apex", + "PlatformProperties", ], required: [ @@ -792,7 +802,10 @@ java_defaults { "--multi-dex", ], - plugins: ["view-inspector-annotation-processor"], + plugins: [ + "view-inspector-annotation-processor", + "staledataclass-annotation-processor", + ], } filegroup { @@ -829,7 +842,7 @@ filegroup { } java_library { - name: "framework", + name: "framework-minus-apex", defaults: ["framework-defaults"], javac_shard_size: 150, required: [ @@ -839,6 +852,17 @@ java_library { } java_library { + name: "framework", + defaults: ["framework-aidl-export-defaults"], + installable: true, + static_libs: [ + "framework-minus-apex", + "jobscheduler-framework", + ], + sdk_version: "core_platform", +} + +java_library { name: "framework-annotation-proc", defaults: ["framework-defaults"], installable: false, @@ -1304,16 +1328,13 @@ framework_docs_only_libs = [ "android-support-compat", "android-support-core-ui", "android-support-core-utils", - "android-support-customtabs", "android-support-design", "android-support-dynamic-animation", "android-support-exifinterface", "android-support-fragment", "android-support-media-compat", "android-support-percent", - "android-support-recommendation", "android-support-transition", - "android-support-tv-provider", "android-support-v7-cardview", "android-support-v7-gridlayout", "android-support-v7-mediarouter", @@ -1322,15 +1343,10 @@ framework_docs_only_libs = [ "android-support-v13", "android-support-v14-preference", "android-support-v17-leanback", - "android-support-v17-preference-leanback", - "android-support-wear", "android-support-vectordrawable", "android-support-animatedvectordrawable", "android-support-v7-appcompat", "android-support-v7-recyclerview", - "android-support-emoji", - "android-support-emoji-appcompat", - "android-support-emoji-bundled", "android-support-v8-renderscript", "android-support-multidex", "android-support-multidex-instrumentation", @@ -1370,8 +1386,9 @@ stubs_defaults { ":updatable-media-srcs-without-aidls", "test-mock/src/**/*.java", "test-runner/src/**/*.java", + ":jobscheduler-framework-source", ], - srcs_lib: "framework", + srcs_lib: "framework-minus-apex", srcs_lib_whitelist_dirs: frameworks_base_subdirs, srcs_lib_whitelist_pkgs: packages_to_document, libs: framework_docs_only_libs, @@ -1427,8 +1444,9 @@ stubs_defaults { ":opt-net-voip-srcs", ":core_public_api_files", ":updatable-media-srcs-without-aidls", + ":jobscheduler-framework-source", ], - srcs_lib: "framework", + srcs_lib: "framework-minus-apex", srcs_lib_whitelist_dirs: frameworks_base_subdirs, srcs_lib_whitelist_pkgs: packages_to_document, local_sourcepaths: frameworks_base_subdirs, |