diff options
| -rw-r--r-- | Android.bp | 72 | ||||
| -rw-r--r-- | packages/Tethering/Android.bp | 1 | ||||
| -rw-r--r-- | packages/Tethering/tests/unit/Android.bp | 1 | ||||
| -rw-r--r-- | telephony/framework-telephony-jarjar-rules.txt | 9 |
4 files changed, 1 insertions, 82 deletions
diff --git a/Android.bp b/Android.bp index 03a6af5997bb..485579f64ab8 100644 --- a/Android.bp +++ b/Android.bp @@ -273,9 +273,6 @@ filegroup { // etc. ":framework-javastream-protos", ":statslog-framework-java-gen", // FrameworkStatsLog.java - - // telephony annotations - ":framework-telephony-annotations", ], } @@ -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"], -} +]
\ No newline at end of file diff --git a/packages/Tethering/Android.bp b/packages/Tethering/Android.bp index 5b052df75ede..bfb65241ec6d 100644 --- a/packages/Tethering/Android.bp +++ b/packages/Tethering/Android.bp @@ -34,7 +34,6 @@ java_defaults { ], libs: [ "framework-tethering", - "framework-telephony-stubs", "framework-wifi-stubs-systemapi", "unsupportedappusage", ], diff --git a/packages/Tethering/tests/unit/Android.bp b/packages/Tethering/tests/unit/Android.bp index 4849fd5d01f5..26517ceb72ae 100644 --- a/packages/Tethering/tests/unit/Android.bp +++ b/packages/Tethering/tests/unit/Android.bp @@ -38,7 +38,6 @@ java_defaults { "ext", "framework-minus-apex", "framework-res", - "framework-telephony-stubs", "framework-tethering", "framework-wifi-stubs-module_libs_api", ], diff --git a/telephony/framework-telephony-jarjar-rules.txt b/telephony/framework-telephony-jarjar-rules.txt deleted file mode 100644 index 212eba153a15..000000000000 --- a/telephony/framework-telephony-jarjar-rules.txt +++ /dev/null @@ -1,9 +0,0 @@ -rule android.telephony.Annotation* android.telephony.framework.Annotation@1 -rule android.util.RecurrenceRule* android.telephony.RecurrenceRule@1 -rule com.android.i18n.phonenumbers.** com.android.telephony.framework.phonenumbers.@1 -rule com.android.internal.os.SomeArgs* android.telephony.SomeArgs@1 -rule com.android.internal.util.BitwiseInputStream* android.telephony.BitwiseInputStream@1 -rule com.android.internal.util.BitwiseOutputStream* android.telephony.BitwiseOutputStream@1 -rule com.android.internal.util.Preconditions* android.telephony.Preconditions@1 -rule com.android.internal.util.IndentingPrintWriter* android.telephony.IndentingPrintWriter@1 -rule com.android.internal.util.HexDump* android.telephony.HexDump@1 |