DO NOT MERGE Remove references of telephony-stubs.
Since it's not used for now. Test: TH Bug: 153304048 Change-Id: I1812818c3d49463c3840a98212bbab58a110359a
This commit is contained in:
65
Android.bp
65
Android.bp
@@ -273,9 +273,6 @@ filegroup {
|
|||||||
// etc.
|
// etc.
|
||||||
":framework-javastream-protos",
|
":framework-javastream-protos",
|
||||||
":statslog-framework-java-gen", // FrameworkStatsLog.java
|
":statslog-framework-java-gen", // FrameworkStatsLog.java
|
||||||
|
|
||||||
// telephony annotations
|
|
||||||
":framework-telephony-annotations",
|
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1227,62 +1224,6 @@ build = [
|
|||||||
"ApiDocs.bp",
|
"ApiDocs.bp",
|
||||||
]
|
]
|
||||||
|
|
||||||
// TODO(b/147699819): move to frameworks/base/telephony/ folder
|
|
||||||
droidstubs {
|
|
||||||
name: "framework-telephony-stubs-srcs",
|
|
||||||
srcs: [
|
|
||||||
":framework-telephony-sources",
|
|
||||||
":framework_native_aidl",
|
|
||||||
":framework-javastream-protos",
|
|
||||||
],
|
|
||||||
aidl: {
|
|
||||||
local_include_dirs: [
|
|
||||||
"core/java",
|
|
||||||
"telecomm/java"
|
|
||||||
],
|
|
||||||
},
|
|
||||||
libs: [
|
|
||||||
"framework-annotations-lib",
|
|
||||||
"android.hardware.radio-V1.5-java",
|
|
||||||
],
|
|
||||||
check_api: {
|
|
||||||
current: {
|
|
||||||
// TODO(b/147699819): remove telephony prefix when moved
|
|
||||||
api_file: "telephony/api/system-current.txt",
|
|
||||||
removed_api_file: "telephony/api/system-removed.txt",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
// TODO: make telephony inherit the shared stubs and remove this
|
|
||||||
args: "--show-annotation android.annotation.SystemApi\\(" +
|
|
||||||
"client=android.annotation.SystemApi.Client.PRIVILEGED_APPS" +
|
|
||||||
"\\) " +
|
|
||||||
"--error UnhiddenSystemApi " +
|
|
||||||
"--hide BroadcastBehavior " +
|
|
||||||
"--hide DeprecationMismatch " +
|
|
||||||
"--hide HiddenSuperclass " +
|
|
||||||
"--hide HiddenTypedefConstant " +
|
|
||||||
"--hide HiddenTypeParameter " +
|
|
||||||
"--hide MissingPermission " +
|
|
||||||
"--hide RequiresPermission " +
|
|
||||||
"--hide SdkConstant " +
|
|
||||||
"--hide Todo " +
|
|
||||||
"--hide Typo " +
|
|
||||||
"--hide UnavailableSymbol ",
|
|
||||||
filter_packages: ["android.telephony"],
|
|
||||||
sdk_version: "system_current",
|
|
||||||
}
|
|
||||||
|
|
||||||
java_library {
|
|
||||||
name: "framework-telephony-stubs",
|
|
||||||
srcs: [":framework-telephony-stubs-srcs"],
|
|
||||||
// TODO(b/147699819): move public aidls to a separate folder and potentially remove
|
|
||||||
// below aidl exports.
|
|
||||||
aidl: {
|
|
||||||
export_include_dirs: ["telephony/java"],
|
|
||||||
},
|
|
||||||
sdk_version: "module_current",
|
|
||||||
}
|
|
||||||
|
|
||||||
java_library {
|
java_library {
|
||||||
name: "framework-telephony",
|
name: "framework-telephony",
|
||||||
srcs: [
|
srcs: [
|
||||||
@@ -1318,12 +1259,6 @@ java_library {
|
|||||||
installable: true,
|
installable: true,
|
||||||
}
|
}
|
||||||
|
|
||||||
filegroup {
|
|
||||||
// TODO (b/147690217): move to frameworks/base/telephony/common.
|
|
||||||
name: "framework-telephony-annotations",
|
|
||||||
srcs: ["telephony/java/android/telephony/Annotation.java"],
|
|
||||||
}
|
|
||||||
|
|
||||||
filegroup {
|
filegroup {
|
||||||
name: "framework-telephony-jarjar-rules",
|
name: "framework-telephony-jarjar-rules",
|
||||||
srcs: ["telephony/framework-telephony-jarjar-rules.txt"],
|
srcs: ["telephony/framework-telephony-jarjar-rules.txt"],
|
||||||
|
|||||||
@@ -34,7 +34,6 @@ java_defaults {
|
|||||||
],
|
],
|
||||||
libs: [
|
libs: [
|
||||||
"framework-tethering",
|
"framework-tethering",
|
||||||
"framework-telephony-stubs",
|
|
||||||
"framework-wifi-stubs-systemapi",
|
"framework-wifi-stubs-systemapi",
|
||||||
"unsupportedappusage",
|
"unsupportedappusage",
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -38,7 +38,6 @@ java_defaults {
|
|||||||
"ext",
|
"ext",
|
||||||
"framework-minus-apex",
|
"framework-minus-apex",
|
||||||
"framework-res",
|
"framework-res",
|
||||||
"framework-telephony-stubs",
|
|
||||||
"framework-tethering",
|
"framework-tethering",
|
||||||
"framework-wifi-stubs-module_libs_api",
|
"framework-wifi-stubs-module_libs_api",
|
||||||
],
|
],
|
||||||
|
|||||||
Reference in New Issue
Block a user