diff options
| -rw-r--r-- | Android.bp | 11 | ||||
| -rw-r--r-- | ApiDocs.bp | 10 | ||||
| -rw-r--r-- | StubLibraries.bp | 1 | ||||
| -rw-r--r-- | core/java/Android.bp | 5 | ||||
| -rw-r--r-- | mime/java/Android.bp | 5 |
5 files changed, 19 insertions, 13 deletions
diff --git a/Android.bp b/Android.bp index 93d1e4e5b020..fe426e779561 100644 --- a/Android.bp +++ b/Android.bp @@ -532,7 +532,7 @@ filegroup { "core/java/**/*.logtags", "**/package.html", ], - visibility: ["//visibility:private"], + visibility: ["//frameworks/base/api"], } // Defaults for all stubs that include the non-updatable framework. These defaults do not include @@ -546,12 +546,10 @@ stubs_defaults { java_version: "1.8", arg_files: [":frameworks-base-core-AndroidManifest.xml"], aidl: { - local_include_dirs: [ - "media/aidl", - "telephony/java", - ], include_dirs: [ "frameworks/av/aidl", + "frameworks/base/media/aidl", + "frameworks/base/telephony/java", "frameworks/native/libs/permission/aidl", "packages/modules/Bluetooth/framework/aidl-export", "packages/modules/Connectivity/framework/aidl-export", @@ -583,7 +581,7 @@ stubs_defaults { annotations_enabled: true, previous_api: ":android.api.public.latest", merge_annotations_dirs: ["metalava-manual"], - defaults_visibility: ["//visibility:private"], + defaults_visibility: ["//frameworks/base/api"], visibility: ["//frameworks/base/api"], } @@ -611,7 +609,6 @@ stubs_defaults { // NOTE: The below can be removed once the prebuilt stub contains IKE. "sdk_system_current_android.net.ipsec.ike", ], - defaults_visibility: ["//visibility:private"], } build = [ diff --git a/ApiDocs.bp b/ApiDocs.bp index a46ecce5c721..fbcaa52f9bb4 100644 --- a/ApiDocs.bp +++ b/ApiDocs.bp @@ -182,10 +182,10 @@ droidstubs { // using droiddoc ///////////////////////////////////////////////////////////////////// -framework_docs_only_args = " -android -manifest $(location core/res/AndroidManifest.xml) " + +framework_docs_only_args = " -android -manifest $(location :frameworks-base-core-AndroidManifest.xml) " + "-metalavaApiSince " + "-werror -lerror -hide 111 -hide 113 -hide 125 -hide 126 -hide 127 -hide 128 " + - "-overview $(location core/java/overview.html) " + + "-overview $(location :frameworks-base-java-overview) " + // Federate Support Library references against local API file. "-federate SupportLib https://developer.android.com " + "-federationapi SupportLib $(location :current-support-api) " + @@ -218,16 +218,16 @@ doc_defaults { "sdk.preview 0", ], arg_files: [ - "core/res/AndroidManifest.xml", - "core/java/overview.html", + ":frameworks-base-core-AndroidManifest.xml", + ":frameworks-base-java-overview", ":current-support-api", ":current-androidx-api", ], // TODO(b/169090544): remove below aidl includes. aidl: { - local_include_dirs: ["media/aidl"], include_dirs: [ "frameworks/av/aidl", + "frameworks/base/media/aidl", "frameworks/native/libs/permission/aidl", ], }, diff --git a/StubLibraries.bp b/StubLibraries.bp index b005591980c0..f08745b5cd2c 100644 --- a/StubLibraries.bp +++ b/StubLibraries.bp @@ -515,6 +515,7 @@ droidstubs { ], api_levels_sdk_type: "public", extensions_info_file: ":sdk-extensions-info", + visibility: ["//frameworks/base"], } droidstubs { diff --git a/core/java/Android.bp b/core/java/Android.bp index 7df3d1e13aa0..8ceea92957ed 100644 --- a/core/java/Android.bp +++ b/core/java/Android.bp @@ -429,6 +429,11 @@ aidl_interface { }, } +filegroup { + name: "frameworks-base-java-overview", + srcs: ["overview.html"], +} + // Avoid including Parcelable classes as we don't want to have two copies of // Parcelable cross the libraries. This is used by telephony-common (frameworks/opt/telephony) // and TeleService app (packages/services/Telephony). diff --git a/mime/java/Android.bp b/mime/java/Android.bp index 07cada8e1372..a267d6593f65 100644 --- a/mime/java/Android.bp +++ b/mime/java/Android.bp @@ -10,5 +10,8 @@ package { filegroup { name: "framework-mime-sources", srcs: ["**/*.java"], - visibility: ["//frameworks/base"], + visibility: [ + "//frameworks/base", + "//frameworks/base/api", + ], } |