diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 80 |
1 files changed, 50 insertions, 30 deletions
diff --git a/Android.bp b/Android.bp index 4ef6c5e82a5d..fe0d5dd82940 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", @@ -566,6 +591,7 @@ java_defaults { "telephony/java/android/telephony/ims/aidl/IImsServiceControllerListener.aidl", "telephony/java/android/telephony/ims/aidl/IImsSmsListener.aidl", "telephony/java/android/telephony/ims/aidl/IRcsMessage.aidl", + "telephony/java/android/telephony/ims/aidl/IRcsFeatureListener.aidl", "telephony/java/android/telephony/mbms/IMbmsDownloadSessionCallback.aidl", "telephony/java/android/telephony/mbms/IMbmsStreamingSessionCallback.aidl", "telephony/java/android/telephony/mbms/IMbmsGroupCallSessionCallback.aidl", @@ -695,34 +721,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", @@ -786,6 +788,9 @@ java_defaults { "android.hardware.vibrator-V1.3-java", "android.hardware.wifi-V1.0-java-constants", "devicepolicyprotosnano", + + "com.android.sysprop.apex", + "PlatformProperties", ], required: [ @@ -838,7 +843,7 @@ filegroup { } java_library { - name: "framework", + name: "framework-minus-apex", defaults: ["framework-defaults"], javac_shard_size: 150, required: [ @@ -848,6 +853,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, @@ -1371,8 +1387,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, @@ -1428,8 +1445,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, @@ -1810,6 +1828,7 @@ droidstubs { last_released: { api_file: ":last-released-public-api", removed_api_file: "api/removed.txt", + baseline_file: ":public-api-incompatibilities-with-last-released", }, }, jdiff_enabled: true, @@ -1835,6 +1854,7 @@ droidstubs { last_released: { api_file: ":last-released-system-api", removed_api_file: "api/system-removed.txt", + baseline_file: ":system-api-incompatibilities-with-last-released" }, }, jdiff_enabled: true, |