Ready more build rules for dir move
Tweak some visibilities and set up more filegroups to enable moving
the ApiDocs.bp and StubLibraries.bp files into the api subdir.
Bug: 271563074
Test: m
(cherry picked from https://android-review.googlesource.com/q/commit:ca6e67a66ba3448b00bd24762ab9494fb54fa8cd)
Merged-In: Ib2776dfc6c67b2042fb2f43a1251cd6f0ba61dc7
Change-Id: Ib2776dfc6c67b2042fb2f43a1251cd6f0ba61dc7
diff --git a/Android.bp b/Android.bp
index 64d2c66..54d9255 100644
--- a/Android.bp
+++ b/Android.bp
@@ -606,7 +606,7 @@
"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
@@ -620,12 +620,10 @@
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",
@@ -661,7 +659,7 @@
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"],
}
@@ -689,7 +687,6 @@
// NOTE: The below can be removed once the prebuilt stub contains IKE.
"sdk_system_current_android.net.ipsec.ike",
],
- defaults_visibility: ["//visibility:private"],
}
build = [