diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 848 |
1 files changed, 173 insertions, 675 deletions
diff --git a/Android.bp b/Android.bp index 15188ece0a6d..8a93fdbc1979 100644 --- a/Android.bp +++ b/Android.bp @@ -245,7 +245,7 @@ filegroup { ":libcamera_client_framework_aidl", ":libupdate_engine_aidl", // TODO: this needs to be removed when statsd-framework.jar is separated out - ":statsd_aidl", + ":statsd_java_aidl", ":storaged_aidl", ":vold_aidl", @@ -262,10 +262,13 @@ filegroup { name: "framework-updatable-sources", srcs: [ ":framework-appsearch-sources", - ":framework-sdkext-sources", + ":framework-sdkextensions-sources", ":framework-statsd-sources", + ":framework-tethering-srcs", ":updatable-media-srcs", + ":framework-mediaprovider-sources", ":framework-wifi-updatable-sources", + ":ike-srcs", ] } @@ -282,6 +285,7 @@ java_defaults { name: "framework-aidl-export-defaults", aidl: { export_include_dirs: [ + "apex/media/framework/java", "core/java", "drm/java", "graphics/java", @@ -289,7 +293,6 @@ java_defaults { "location/java", "lowpan/java", "media/java", - "media/apex/java", "media/mca/effect/java", "media/mca/filterfw/java", "media/mca/filterpacks/java", @@ -345,15 +348,11 @@ java_library { "android.hardware.vibrator-V1.1-java", "android.hardware.vibrator-V1.2-java", "android.hardware.vibrator-V1.3-java", - "android.hardware.wifi-V1.0-java-constants", "devicepolicyprotosnano", "com.android.sysprop.apex", "PlatformProperties", ], - aidl: { - include_dirs: ["system/connectivity/wificond/aidl"], - }, sdk_version: "core_platform", installable: false, } @@ -380,6 +379,8 @@ java_defaults { "ext", "unsupportedappusage", "updatable_media_stubs", + "framework_mediaprovider_stubs", + "framework-tethering", ], jarjar_rules: ":framework-jarjar-rules", @@ -414,6 +415,13 @@ filegroup { } filegroup { + name: "graphicsstats_proto", + srcs: [ + "libs/hwui/protos/graphicsstats.proto", + ], +} + +filegroup { name: "libvibrator_aidl", srcs: [ "core/java/android/os/IExternalVibrationController.aidl", @@ -431,6 +439,7 @@ java_library { // TODO(b/146167933): Use framework-statsd-stubs "framework-statsd", "framework-wifi-stubs", + "ike-stubs", ], installable: true, javac_shard_size: 150, @@ -439,8 +448,6 @@ java_library { "libcore-platform-compat-config", "services-platform-compat-config", "media-provider-platform-compat-config", - "services-devicepolicy-platform-compat-config", - "services-core-platform-compat-config", ], static_libs: [ // If MimeMap ever becomes its own APEX, then this dependency would need to be removed @@ -450,6 +457,16 @@ java_library { // For backwards compatibility. stem: "framework", apex_available: ["//apex_available:platform"], + visibility: [ + "//frameworks/base", + // TODO(b/144149403) remove the below lines + "//frameworks/base/apex/appsearch/framework", + "//frameworks/base/apex/blobstore/framework", + "//frameworks/base/apex/jobscheduler/framework", + "//frameworks/base/apex/statsd/service", + "//frameworks/base/wifi", + "//frameworks/opt/net/wifi/service", + ], } // This "framework" module is NOT installed to the device. It's @@ -467,13 +484,17 @@ java_library { installable: false, // this lib is a build-only library static_libs: [ "framework-minus-apex", - "framework-appsearch", // TODO(b/146218515): should be framework-appsearch-stubs - "framework-sdkext-stubs-systemapi", + "updatable_media_stubs", + "framework_mediaprovider_stubs", + "framework-appsearch-stubs", + "framework-sdkextensions-stubs-systemapi", // TODO(b/146167933): Use framework-statsd-stubs instead. "framework-statsd", // TODO(b/140299412): should be framework-wifi-stubs "framework-wifi", - // TODO(jiyong): add more stubs for APEXes here + "ike-stubs", + // TODO(b/147200698): should be the stub of framework-tethering + "framework-tethering", ], sdk_version: "core_platform", apex_available: ["//apex_available:platform"], @@ -484,7 +505,10 @@ java_library { defaults: ["framework-defaults"], srcs: [":framework-all-sources"], installable: false, - static_libs: ["exoplayer2-core"], + static_libs: [ + "exoplayer2-core", + "android.hardware.wifi-V1.0-java-constants", + ], apex_available: ["//apex_available:platform"], } @@ -582,21 +606,38 @@ gensrcs { filegroup { name: "framework-annotations", srcs: [ - "core/java/android/annotation/NonNull.java", - "core/java/android/annotation/Nullable.java", + "core/java/android/annotation/CallbackExecutor.java", + "core/java/android/annotation/CheckResult.java", "core/java/android/annotation/IntDef.java", "core/java/android/annotation/IntRange.java", + "core/java/android/annotation/NonNull.java", + "core/java/android/annotation/Nullable.java", + "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/SystemService.java", + "core/java/android/annotation/TestApi.java", "core/java/android/annotation/UnsupportedAppUsage.java", "core/java/com/android/internal/annotations/GuardedBy.java", "core/java/com/android/internal/annotations/VisibleForTesting.java", + "core/java/com/android/internal/annotations/Immutable.java", ], } java_library { name: "framework-annotations-lib", srcs: [ ":framework-annotations" ], - sdk_version: "current", + sdk_version: "core_current", +} + +filegroup { + name: "framework-ike-shared-srcs", + visibility: ["//frameworks/opt/net/ike"], + srcs: [ + "core/java/android/net/annotations/PolicyDirection.java", + "telephony/java/android/telephony/Annotation.java", + ], } filegroup { @@ -616,14 +657,32 @@ filegroup { "core/java/com/android/internal/util/StateMachine.java", "core/java/com/android/internal/util/TrafficStatsConstants.java", "core/java/com/android/internal/util/WakeupMessage.java", + "core/java/com/android/internal/util/TokenBucket.java", "core/java/android/net/shared/*.java", ], } +// keep these files in sync with the package/Tethering/jarjar-rules.txt for the tethering module. filegroup { name: "framework-tethering-shared-srcs", srcs: [ "core/java/android/util/LocalLog.java", + "core/java/com/android/internal/util/IndentingPrintWriter.java", + "core/java/com/android/internal/util/IState.java", + "core/java/com/android/internal/util/MessageUtils.java", + "core/java/com/android/internal/util/Preconditions.java", + "core/java/com/android/internal/util/State.java", + "core/java/com/android/internal/util/StateMachine.java", + "core/java/com/android/internal/util/TrafficStatsConstants.java", + "core/java/android/net/shared/Inet4AddressUtils.java", + ], +} + +filegroup { + name: "framework-tethering-annotations", + srcs: [ + "core/java/android/annotation/NonNull.java", + "core/java/android/annotation/SystemApi.java", ], } // Build ext.jar @@ -674,7 +733,7 @@ java_library { "core/proto/android/privacy.proto", "core/proto/android/section.proto", ], - sdk_version: "current", + sdk_version: "9", srcs: [ "core/proto/**/*.proto", "libs/incident/proto/android/os/**/*.proto", @@ -697,6 +756,7 @@ java_library { "core/proto/android/privacy.proto", "core/proto/android/section.proto", ], + sdk_version: "core_current", // Protos have lots of MissingOverride and similar. errorprone: { javacflags: ["-XepDisableAllChecks"], @@ -799,11 +859,7 @@ cc_library { filegroup { name: "incremental_aidl", srcs: [ - "core/java/android/os/incremental/IIncrementalManagerNative.aidl", - "core/java/android/os/incremental/IIncrementalManager.aidl", - "core/java/android/os/incremental/IncrementalDataLoaderParamsParcel.aidl", "core/java/android/os/incremental/IncrementalFileSystemControlParcel.aidl", - "core/java/android/os/incremental/NamedParcelFileDescriptor.aidl", ], path: "core/java", } @@ -811,7 +867,21 @@ filegroup { filegroup { name: "dataloader_aidl", srcs: [ + "core/java/android/content/pm/DataLoaderParamsParcel.aidl", + "core/java/android/content/pm/DataLoaderType.aidl", + "core/java/android/content/pm/FileSystemControlParcel.aidl", "core/java/android/content/pm/IDataLoaderStatusListener.aidl", + "core/java/android/content/pm/IPackageInstallerSessionFileSystemConnector.aidl", + "core/java/android/content/pm/NamedParcelFileDescriptor.aidl", + ], + path: "core/java", +} + +filegroup { + name: "incremental_manager_aidl", + srcs: [ + "core/java/android/os/incremental/IIncrementalManager.aidl", + "core/java/android/os/incremental/IIncrementalManagerNative.aidl", ], path: "core/java", } @@ -821,9 +891,6 @@ aidl_interface { srcs: [ ":incremental_aidl", ], - imports: [ - "libdataloader_aidl", - ], backend: { java: { sdk_version: "28", @@ -842,6 +909,9 @@ aidl_interface { srcs: [ ":dataloader_aidl", ], + imports: [ + "libincremental_aidl", + ], backend: { java: { sdk_version: "28", @@ -850,8 +920,30 @@ aidl_interface { enabled: true, }, ndk: { + enabled: false, + }, + }, +} + +aidl_interface { + name: "libincremental_manager_aidl", + srcs: [ + ":incremental_manager_aidl", + ], + imports: [ + "libincremental_aidl", + "libdataloader_aidl", + ], + backend: { + java: { + sdk_version: "28", + }, + cpp: { enabled: true, }, + ndk: { + enabled: false, + }, }, } @@ -935,6 +1027,7 @@ java_library { "core/java/android/os/RemoteException.java", "core/java/android/util/AndroidException.java", ], + libs: [ "unsupportedappusage" ], dxflags: ["--core-library"], installable: false, @@ -966,645 +1059,6 @@ python_binary_host { ], } -// Make the api/current.txt file available for use by modules in other -// directories. -filegroup { - name: "frameworks-base-api-current.txt", - srcs: [ - "api/current.txt", - ], -} - -// Make the api/system-current.txt file available for use by modules in other -// directories. -filegroup { - name: "frameworks-base-api-system-current.txt", - srcs: [ - "api/system-current.txt", - ], -} - -// Make the api/system-removed.txt file available for use by modules in other -// directories. -filegroup { - name: "frameworks-base-api-system-removed.txt", - srcs: [ - "api/system-removed.txt", - ], -} - -framework_docs_only_args = " -android -manifest $(location core/res/AndroidManifest.xml) " + - "-werror -lerror -hide 111 -hide 113 -hide 125 -hide 126 -hide 127 -hide 128 " + - "-overview $(location core/java/overview.html) " + - // Federate Support Library references against local API file. - "-federate SupportLib https://developer.android.com " + - "-federationapi SupportLib $(location :current-support-api) " + - // Federate Support Library references against local API file. - "-federate AndroidX https://developer.android.com " + - "-federationapi AndroidX $(location :current-androidx-api) " - -framework_docs_only_libs = [ - "voip-common", - "android.test.mock", - "android-support-annotations", - "android-support-compat", - "android-support-core-ui", - "android-support-core-utils", - "android-support-design", - "android-support-dynamic-animation", - "android-support-exifinterface", - "android-support-fragment", - "android-support-media-compat", - "android-support-percent", - "android-support-transition", - "android-support-v7-cardview", - "android-support-v7-gridlayout", - "android-support-v7-mediarouter", - "android-support-v7-palette", - "android-support-v7-preference", - "android-support-v13", - "android-support-v14-preference", - "android-support-v17-leanback", - "android-support-vectordrawable", - "android-support-animatedvectordrawable", - "android-support-v7-appcompat", - "android-support-v7-recyclerview", - "android-support-v8-renderscript", - "android-support-multidex", - "android-support-multidex-instrumentation", -] - -metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.xml) " + - "--ignore-classes-on-classpath " + - "--hide-package com.android.server " + - "--error UnhiddenSystemApi " + - "--hide RequiresPermission " + - "--hide CallbackInterface " + - "--hide MissingPermission --hide BroadcastBehavior " + - "--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol " + - "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo " + - "--force-convert-to-warning-nullability-annotations +*:-android.*:+android.icu.*:-dalvik.*" - -packages_to_document = [ - "android", - "dalvik", - "java", - "javax", - "junit", - "org.apache.http", - "org.json", - "org.w3c.dom", - "org.xml.sax", - "org.xmlpull", -] - -stubs_defaults { - name: "framework-doc-stubs-default", - srcs: [ - ":framework-mime-sources", - ":framework-non-updatable-sources", - ":framework-updatable-sources", - "core/java/**/*.logtags", - "test-base/src/**/*.java", - ":opt-telephony-srcs", - ":opt-net-voip-srcs", - ":core-current-stubs-source", - ":core_public_api_files", - "test-mock/src/**/*.java", - "test-runner/src/**/*.java", - ], - libs: framework_docs_only_libs, - create_doc_stubs: true, - annotations_enabled: true, - api_levels_annotations_enabled: true, - api_levels_annotations_dirs: [ - "sdk-dir", - "api-versions-jars-dir", - ], - previous_api: ":last-released-public-api", - merge_annotations_dirs: [ - "metalava-manual", - ], -} - -doc_defaults { - name: "framework-docs-default", - libs: framework_docs_only_libs + - ["stub-annotations"], - html_dirs: [ - "docs/html", - ], - knowntags: [ - "docs/knowntags.txt", - ":known-oj-tags", - ], - custom_template: "droiddoc-templates-sdk", - resourcesdir: "docs/html/reference/images/", - resourcesoutdir: "reference/android/images/", - hdf: [ - "dac true", - "sdk.codename O", - "sdk.preview.version 1", - "sdk.version 7.0", - "sdk.rel.id 1", - "sdk.preview 0", - ], - arg_files: [ - "core/res/AndroidManifest.xml", - "core/java/overview.html", - ":current-support-api", - ":current-androidx-api", - ], - create_stubs: false, -} - -doc_defaults { - name: "framework-dokka-docs-default", - create_stubs: false, -} - -stubs_defaults { - name: "metalava-api-stubs-default", - srcs: [ - ":framework-non-updatable-sources", - ":framework-updatable-sources", - "core/java/**/*.logtags", - ":opt-telephony-srcs", - ":opt-net-voip-srcs", - ":core-current-stubs-source", - ":core_public_api_files", - ":ike-api-srcs", - ], - libs: ["framework-internal-utils"], - installable: false, - annotations_enabled: true, - previous_api: ":last-released-public-api", - merge_annotations_dirs: [ - "metalava-manual", - ], - api_levels_annotations_enabled: true, - api_levels_annotations_dirs: [ - "sdk-dir", - "api-versions-jars-dir", - ], - sdk_version: "core_platform", - filter_packages: packages_to_document, -} - -droidstubs { - name: "framework-doc-stubs", - defaults: ["framework-doc-stubs-default"], - arg_files: [ - "core/res/AndroidManifest.xml", - ], - args: metalava_framework_docs_args, - write_sdk_values: true, -} - -droidstubs { - name: "framework-doc-system-stubs", - defaults: ["framework-doc-stubs-default"], - arg_files: [ - "core/res/AndroidManifest.xml", - ], - args: metalava_framework_docs_args + " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS,process=android.annotation.SystemApi.Process.ALL\\) ", - write_sdk_values: true, -} - -droiddoc { - name: "doc-comment-check-docs", - defaults: ["framework-docs-default"], - srcs: [ - ":framework-doc-stubs", - ], - args: framework_docs_only_args + " -referenceonly -parsecomments", - installable: false, -} - -droiddoc { - name: "offline-sdk-docs", - defaults: ["framework-docs-default"], - srcs: [ - ":framework-doc-stubs", - ], - hdf: [ - "android.whichdoc offline", - ], - proofread_file: "offline-sdk-docs-proofrerad.txt", - args: framework_docs_only_args + " -offlinemode -title \"Android SDK\"", - static_doc_index_redirect: "docs/docs-preview-index.html", -} - -droiddoc { - // Please sync with android-api-council@ before making any changes for the name property below. - // Since there's cron jobs that fetch offline-sdk-referenceonly-docs-docs.zip periodically. - // See b/116221385 for reference. - name: "offline-sdk-referenceonly-docs", - defaults: ["framework-docs-default"], - srcs: [ - ":framework-doc-stubs", - ], - hdf: [ - "android.whichdoc offline", - ], - proofread_file: "offline-sdk-referenceonly-docs-proofrerad.txt", - args: framework_docs_only_args + " -offlinemode -title \"Android SDK\" -referenceonly", - static_doc_index_redirect: "docs/docs-documentation-redirect.html", - static_doc_properties: "docs/source.properties", -} - -droiddoc { - // Please sync with android-api-council@ before making any changes for the name property below. - // Since there's cron jobs that fetch offline-system-sdk-referenceonly-docs-docs.zip periodically. - // See b/116221385 for reference. - name: "offline-system-sdk-referenceonly-docs", - defaults: ["framework-docs-default"], - srcs: [ - ":framework-doc-system-stubs", - ], - hdf: [ - "android.whichdoc offline", - ], - proofread_file: "offline-system-sdk-referenceonly-docs-proofrerad.txt", - args: framework_docs_only_args + " -hide 101 -hide 104 -hide 108" + - " -offlinemode -title \"Android System SDK\" -referenceonly", - static_doc_index_redirect: "docs/docs-documentation-redirect.html", - static_doc_properties: "docs/source.properties", -} - -droiddoc { - name: "online-sdk-docs", - defaults: ["framework-docs-default"], - srcs: [ - ":framework-doc-stubs", - ], - hdf: [ - "android.whichdoc online", - "android.hasSamples true", - ], - proofread_file: "online-sdk-docs-proofrerad.txt", - args: framework_docs_only_args + - " -toroot / -samplegroup Admin " + - " -samplegroup Background " + - " -samplegroup Connectivity " + - " -samplegroup Content " + - " -samplegroup Input " + - " -samplegroup Media " + - " -samplegroup Notification " + - " -samplegroup RenderScript " + - " -samplegroup Security " + - " -samplegroup Sensors " + - " -samplegroup System " + - " -samplegroup Testing " + - " -samplegroup UI " + - " -samplegroup Views " + - " -samplegroup Wearable -samplesdir development/samples/browseable ", -} - -droiddoc { - name: "online-system-api-sdk-docs", - defaults: ["framework-docs-default"], - srcs: [ - ":framework-doc-system-stubs", - ], - hdf: [ - "android.whichdoc online", - "android.hasSamples true", - ], - proofread_file: "online-system-api-sdk-docs-proofrerad.txt", - args: framework_docs_only_args + - " -referenceonly " + - " -title \"Android SDK - Including system APIs.\" " + - " -hide 101 " + - " -hide 104 " + - " -hide 108 " + - " -toroot / -samplegroup Admin " + - " -samplegroup Background " + - " -samplegroup Connectivity " + - " -samplegroup Content " + - " -samplegroup Input " + - " -samplegroup Media " + - " -samplegroup Notification " + - " -samplegroup RenderScript " + - " -samplegroup Security " + - " -samplegroup Sensors " + - " -samplegroup System " + - " -samplegroup Testing " + - " -samplegroup UI " + - " -samplegroup Views " + - " -samplegroup Wearable -samplesdir development/samples/browseable ", - installable: false, -} - -droiddoc { - name: "ds-docs-java", - defaults: ["framework-docs-default"], - srcs: [ - ":framework-doc-stubs", - ], - hdf: [ - "android.whichdoc online", - "android.hasSamples true", - ], - proofread_file: "ds-docs-proofrerad.txt", - args: framework_docs_only_args + - " -toroot / -yamlV2 -metalavaApiSince -samplegroup Admin " + - " -samplegroup Background " + - " -samplegroup Connectivity " + - " -samplegroup Content " + - " -samplegroup Input " + - " -samplegroup Media " + - " -samplegroup Notification " + - " -samplegroup RenderScript " + - " -samplegroup Security " + - " -samplegroup Sensors " + - " -samplegroup System " + - " -samplegroup Testing " + - " -samplegroup UI " + - " -samplegroup Views " + - " -samplegroup Wearable -devsite -samplesdir development/samples/browseable ", -} - -droiddoc { - name: "ds-docs-kt", - defaults: ["framework-dokka-docs-default"], - srcs: [ - ":framework-doc-stubs", - ], - args: "-noJdkLink -links https://kotlinlang.org/api/latest/jvm/stdlib/^external/dokka/package-list " + - "-noStdlibLink", - proofread_file: "ds-dokka-proofread.txt", - dokka_enabled: true, -} - -java_genrule { - name: "ds-docs", - tools: [ - "zip2zip", - "merge_zips", - ], - srcs: [ - ":ds-docs-java{.docs.zip}", - ":ds-docs-kt{.docs.zip}", - ], - out: ["ds-docs.zip"], - dist: { - targets: ["docs"], - }, - cmd: "$(location zip2zip) -i $(location :ds-docs-kt{.docs.zip}) -o $(genDir)/ds-docs-kt-moved.zip **/*:en/reference/kotlin && " + - "$(location merge_zips) $(out) $(location :ds-docs-java{.docs.zip}) $(genDir)/ds-docs-kt-moved.zip", -} - -java_genrule { - name: "ds-docs-switched", - tools: [ - "switcher4", - "soong_zip", - ], - srcs: [ - ":ds-docs-java{.docs.zip}", - ":ds-docs-kt{.docs.zip}", - ], - out: ["ds-docs-switched.zip"], - dist: { - targets: ["docs"], - }, - cmd: "unzip $(location :ds-docs-java{.docs.zip}) -d $(genDir) && " + - "unzip $(location :ds-docs-kt{.docs.zip}) -d $(genDir)/en/reference/kotlin && " + - "SWITCHER=$$(cd $$(dirname $(location switcher4)) && pwd)/$$(basename $(location switcher4)) && " + - "(cd $(genDir)/en/reference && $$SWITCHER --work platform) && " + - "$(location soong_zip) -o $(out) -C $(genDir) -D $(genDir)", -} - - -droiddoc { - name: "ds-static-docs", - defaults: ["framework-docs-default"], - srcs: [ - ":framework-doc-stubs", - ], - hdf: [ - "android.whichdoc online", - ], - proofread_file: "ds-static-docs-proofrerad.txt", - args: framework_docs_only_args + - " -staticonly " + - " -toroot / " + - " -devsite " + - " -ignoreJdLinks ", -} - -droiddoc { - name: "ds-ref-navtree-docs", - defaults: ["framework-docs-default"], - srcs: [ - ":framework-doc-stubs", - ], - hdf: [ - "android.whichdoc online", - ], - proofread_file: "ds-ref-navtree-docs-proofrerad.txt", - args: framework_docs_only_args + - " -toroot / " + - " -atLinksNavtree " + - " -navtreeonly ", -} - -droiddoc { - name: "online-sdk-dev-docs", - defaults: ["framework-docs-default"], - srcs: [ - ":framework-doc-stubs", - ], - hdf: [ - "android.whichdoc online", - "android.hasSamples true", - ], - proofread_file: "online-sdk-dev-docs-proofrerad.txt", - args: framework_docs_only_args + - " -toroot / -samplegroup Admin " + - " -samplegroup Background " + - " -samplegroup Connectivity " + - " -samplegroup Content " + - " -samplegroup Input " + - " -samplegroup Media " + - " -samplegroup Notification " + - " -samplegroup RenderScript " + - " -samplegroup Security " + - " -samplegroup Sensors " + - " -samplegroup System " + - " -samplegroup Testing " + - " -samplegroup UI " + - " -samplegroup Views " + - " -samplegroup Wearable -samplesdir development/samples/browseable ", -} - -droiddoc { - name: "hidden-docs", - defaults: ["framework-docs-default"], - srcs: [ - ":framework-doc-stubs", - ], - proofread_file: "hidden-docs-proofrerad.txt", - args: framework_docs_only_args + - " -referenceonly " + - " -title \"Android SDK - Including hidden APIs.\"", -} - -droidstubs { - name: "hwbinder-stubs-docs", - srcs: [ - "core/java/android/os/HidlSupport.java", - "core/java/android/annotation/IntDef.java", - "core/java/android/annotation/IntRange.java", - "core/java/android/annotation/NonNull.java", - "core/java/android/annotation/SystemApi.java", - "core/java/android/os/HidlMemory.java", - "core/java/android/os/HwBinder.java", - "core/java/android/os/HwBlob.java", - "core/java/android/os/HwParcel.java", - "core/java/android/os/IHwBinder.java", - "core/java/android/os/IHwInterface.java", - "core/java/android/os/DeadObjectException.java", - "core/java/android/os/DeadSystemException.java", - "core/java/android/os/NativeHandle.java", - "core/java/android/os/RemoteException.java", - "core/java/android/util/AndroidException.java", - ], - installable: false, - sdk_version: "core_platform", - annotations_enabled: true, - previous_api: ":last-released-public-api", - merge_annotations_dirs: [ - "metalava-manual", - ], - args: " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS,process=android.annotation.SystemApi.Process.ALL\\)", -} - -java_library_static { - name: "hwbinder.stubs", - sdk_version: "core_current", - srcs: [ - ":hwbinder-stubs-docs", - ], -} - -droidstubs { - name: "hiddenapi-lists-docs", - defaults: ["metalava-api-stubs-default"], - arg_files: [ - "core/res/AndroidManifest.xml", - ], - dex_api_filename: "public-dex.txt", - private_dex_api_filename: "private-dex.txt", - removed_dex_api_filename: "removed-dex.txt", - args: metalava_framework_docs_args + - " --show-unannotated " + - " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS,process=android.annotation.SystemApi.Process.ALL\\) " + - " --show-annotation android.annotation.TestApi ", -} - -droidstubs { - name: "hiddenapi-mappings", - defaults: ["metalava-api-stubs-default"], - srcs: [ - ":opt-telephony-common-srcs", - ], - - arg_files: [ - "core/res/AndroidManifest.xml", - ], - dex_mapping_filename: "dex-mapping.txt", - args: metalava_framework_docs_args + - " --hide ReferencesHidden " + - " --hide UnhiddenSystemApi " + - " --show-unannotated " + - " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS,process=android.annotation.SystemApi.Process.ALL\\) " + - " --show-annotation android.annotation.TestApi ", -} - -droidstubs { - name: "api-stubs-docs", - defaults: ["metalava-api-stubs-default"], - api_filename: "public_api.txt", - private_api_filename: "private.txt", - removed_api_filename: "removed.txt", - arg_files: [ - "core/res/AndroidManifest.xml", - ], - args: metalava_framework_docs_args, - check_api: { - current: { - api_file: "api/current.txt", - removed_api_file: "api/removed.txt", - }, - last_released: { - api_file: ":last-released-public-api", - removed_api_file: "api/removed.txt", - baseline_file: ":public-api-incompatibilities-with-last-released", - }, - api_lint: { - enabled: true, - new_since: ":last-released-public-api", - baseline_file: "api/lint-baseline.txt", - }, - }, - jdiff_enabled: true, -} - -droidstubs { - name: "system-api-stubs-docs", - defaults: ["metalava-api-stubs-default"], - api_tag_name: "SYSTEM", - api_filename: "system-api.txt", - private_api_filename: "system-private.txt", - private_dex_api_filename: "system-private-dex.txt", - removed_api_filename: "system-removed.txt", - arg_files: [ - "core/res/AndroidManifest.xml", - ], - args: metalava_framework_docs_args + " --show-annotation android.annotation.SystemApi\\(client=android.annotation.SystemApi.Client.PRIVILEGED_APPS,process=android.annotation.SystemApi.Process.ALL\\)", - check_api: { - current: { - api_file: "api/system-current.txt", - removed_api_file: "api/system-removed.txt", - }, - last_released: { - api_file: ":last-released-system-api", - removed_api_file: "api/system-removed.txt", - baseline_file: ":system-api-incompatibilities-with-last-released" - }, - api_lint: { - enabled: true, - new_since: ":last-released-system-api", - baseline_file: "api/system-lint-baseline.txt", - }, - }, - jdiff_enabled: true, -} - -droidstubs { - name: "test-api-stubs-docs", - defaults: ["metalava-api-stubs-default"], - api_tag_name: "TEST", - api_filename: "test-api.txt", - removed_api_filename: "test-removed.txt", - arg_files: [ - "core/res/AndroidManifest.xml", - ], - args: metalava_framework_docs_args + " --show-annotation android.annotation.TestApi", - check_api: { - current: { - api_file: "api/test-current.txt", - removed_api_file: "api/test-removed.txt", - }, - api_lint: { - enabled: true, - baseline_file: "api/test-lint-baseline.txt", - }, - }, -} - filegroup { name: "framework-annotation-nonnull-srcs", srcs: [ @@ -1615,20 +1069,23 @@ filegroup { filegroup { name: "framework-media-annotation-srcs", srcs: [ + ":framework-annotations", "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", - "core/java/android/annotation/NonNull.java", - "core/java/android/annotation/Nullable.java", - "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", + ], +} + +filegroup { + name: "framework-mediaprovider-annotation-sources", + srcs: [ + ":framework-annotations", + "core/java/android/annotation/BytesLong.java", + "core/java/android/annotation/CurrentTimeMillisLong.java", + "core/java/android/annotation/CurrentTimeSecondsLong.java", + "core/java/android/annotation/DurationMillisLong.java", ], } @@ -1655,6 +1112,7 @@ genrule { filegroup { name: "framework-telephony-stack-shared-srcs", srcs: [ + "core/java/android/os/BasicShellCommandHandler.java", "core/java/android/os/RegistrantList.java", "core/java/android/os/Registrant.java", "core/java/android/util/LocalLog.java", @@ -1697,12 +1155,36 @@ filegroup { ], } +// utility classes statically linked into framework-wifi and dynamically linked +// into wifi-service +java_library { + name: "framework-wifi-util-lib", + sdk_version: "core_current", + srcs: [ + "core/java/android/content/pm/BaseParceledListSlice.java", + "core/java/android/content/pm/ParceledListSlice.java", + "core/java/android/net/shared/Inet4AddressUtils.java", + "core/java/android/os/HandlerExecutor.java", + "core/java/com/android/internal/util/AsyncChannel.java", + "core/java/com/android/internal/util/AsyncService.java", + "core/java/com/android/internal/util/Protocol.java", + "core/java/com/android/internal/util/Preconditions.java", + "telephony/java/android/telephony/Annotation.java", + ], + libs: [ + "framework-annotations-lib", + "unsupportedappusage", + "android_system_stubs_current", + ], + visibility: ["//frameworks/base/wifi"], +} + +// utility classes statically linked into wifi-service filegroup { name: "framework-wifi-service-shared-srcs", srcs: [ - ":framework-annotations", "core/java/android/net/InterfaceConfiguration.java", - "core/java/android/os/HandlerExecutor.java", + "core/java/android/os/BasicShellCommandHandler.java", "core/java/android/util/BackupUtils.java", "core/java/android/util/LocalLog.java", "core/java/android/util/Rational.java", @@ -1710,10 +1192,26 @@ filegroup { "core/java/com/android/internal/util/HexDump.java", "core/java/com/android/internal/util/IState.java", "core/java/com/android/internal/util/MessageUtils.java", - "core/java/com/android/internal/util/Preconditions.java", "core/java/com/android/internal/util/State.java", "core/java/com/android/internal/util/StateMachine.java", "core/java/com/android/internal/util/WakeupMessage.java", "core/java/com/android/internal/util/XmlUtils.java", ], } + +// TODO(b/145644363): move this to under StubLibraries.bp or ApiDocs.bp +metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.xml) " + + "--ignore-classes-on-classpath " + + "--hide-package com.android.server " + + "--error UnhiddenSystemApi " + + "--hide RequiresPermission " + + "--hide CallbackInterface " + + "--hide MissingPermission --hide BroadcastBehavior " + + "--hide HiddenSuperclass --hide DeprecationMismatch --hide UnavailableSymbol " + + "--hide SdkConstant --hide HiddenTypeParameter --hide Todo --hide Typo " + + "--force-convert-to-warning-nullability-annotations +*:-android.*:+android.icu.*:-dalvik.*" + +build = [ + "StubLibraries.bp", + "ApiDocs.bp", +] |