Skip to content

Commit

Permalink
DO NOT MERGE Remove references of telephony-stubs.
Browse files Browse the repository at this point in the history
Since it's not used for now.

Test: TH
Bug: 153304048
Merged-in: I1812818c3d49463c3840a98212bbab58a110359a
Change-Id: I1812818c3d49463c3840a98212bbab58a110359a
  • Loading branch information
Amit Mahajan committed Apr 16, 2020
1 parent 7454840 commit 7973105
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 82 deletions.
72 changes: 1 addition & 71 deletions Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -273,9 +273,6 @@ filegroup {
// etc.
":framework-javastream-protos",
":statslog-framework-java-gen", // FrameworkStatsLog.java

// telephony annotations
":framework-telephony-annotations",
],
}

Expand Down Expand Up @@ -1222,71 +1219,4 @@ metalava_framework_docs_args = "--manifest $(location core/res/AndroidManifest.x
build = [
"StubLibraries.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",
}

filegroup {
// TODO (b/147690217): move to frameworks/base/telephony/common.
name: "framework-telephony-annotations",
srcs: ["telephony/java/android/telephony/Annotation.java"],
}

filegroup {
name: "framework-telephony-jarjar-rules",
srcs: ["telephony/framework-telephony-jarjar-rules.txt"],
}
]
1 change: 0 additions & 1 deletion packages/Tethering/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ java_defaults {
],
libs: [
"framework-tethering",
"framework-telephony-stubs",
"framework-wifi-stubs-systemapi",
"unsupportedappusage",
],
Expand Down
1 change: 0 additions & 1 deletion packages/Tethering/tests/unit/Android.bp
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ java_defaults {
"ext",
"framework-minus-apex",
"framework-res",
"framework-telephony-stubs",
"framework-tethering",
"framework-wifi-stubs-module_libs_api",
],
Expand Down
9 changes: 0 additions & 9 deletions telephony/framework-telephony-jarjar-rules.txt

This file was deleted.

0 comments on commit 7973105

Please sign in to comment.