diff options
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 88 |
1 files changed, 12 insertions, 76 deletions
diff --git a/Android.bp b/Android.bp index 3c512563f31c..6653bd44966b 100644 --- a/Android.bp +++ b/Android.bp @@ -239,6 +239,7 @@ filegroup { ":framework-sax-sources", ":framework-telecomm-sources", ":framework-telephony-common-sources", + ":framework-telephony-sources", ":framework-wifi-annotations", ":framework-wifi-non-updatable-sources", ":PacProcessor-aidl-sources", @@ -285,7 +286,6 @@ filegroup { ":framework-permission-sources", ":framework-sdkextensions-sources", ":framework-statsd-sources", - ":framework-telephony-sources", ":framework-tethering-srcs", ":framework-wifi-updatable-sources", ":updatable-media-srcs", @@ -300,7 +300,6 @@ java_library { "framework-permission-stubs-module_libs_api", "framework-sdkextensions-stubs-module_libs_api", "framework-statsd-stubs-module_libs_api", - "framework-telephony-stubs", // TODO: Update to module_libs_api when there is one. "framework-tethering-stubs-module_libs_api", "framework-wifi-stubs-module_libs_api", ], @@ -418,7 +417,6 @@ java_defaults { "app-compat-annotations", "ext", "unsupportedappusage", - "framework-updatable-stubs-module_libs_api", ], jarjar_rules: ":framework-jarjar-rules", @@ -492,6 +490,7 @@ java_library { "services-platform-compat-config", "documents-ui-compat-config", ], + libs: ["framework-updatable-stubs-module_libs_api"], static_libs: [ // If MimeMap ever becomes its own APEX, then this dependency would need to be removed // in favor of an API stubs dependency in java_library "framework" below. @@ -523,9 +522,8 @@ java_library { defaults: ["framework-aidl-export-defaults"], installable: false, // this lib is a build-only library static_libs: [ + "app-compat-annotations", "framework-minus-apex", - // TODO (b/147688669) should be removed - "framework-telephony", "framework-updatable-stubs-module_libs_api", ], sdk_version: "core_platform", @@ -545,6 +543,7 @@ java_library { visibility: [ // DO NOT ADD ANY MORE ENTRIES TO THIS LIST "//external/robolectric-shadows:__subpackages__", + "//frameworks/base", "//frameworks/layoutlib:__subpackages__", ], } @@ -564,7 +563,6 @@ java_library { installable: false, plugins: [ - "unsupportedappusage-annotation-processor", "compat-changeid-annotation-processor", ], static_libs: [ @@ -579,25 +577,6 @@ platform_compat_config { src: ":framework-annotation-proc", } -// A library including just UnsupportedAppUsage.java classes. -// -// Provided for target so that libraries can use it without depending on -// the whole of framework or the core platform API. -// -// Built for host so that the annotation processor can also use this annotation. -java_library { - name: "unsupportedappusage-annotation", - host_supported: true, - srcs: [ - "core/java/android/annotation/IntDef.java", - ], - static_libs: [ - "art.module.api.annotations", - ], - - sdk_version: "core_current", -} - // A temporary build target that is conditionally included on the bootclasspath if // android.test.base library has been removed and which provides support for // maintaining backwards compatibility for APKs that target pre-P and depend on @@ -724,6 +703,7 @@ filegroup { srcs: [ "core/java/android/annotation/StringDef.java", "core/java/android/net/annotations/PolicyDirection.java", + "core/java/com/android/internal/util/HexDump.java", "core/java/com/android/internal/util/IState.java", "core/java/com/android/internal/util/State.java", "core/java/com/android/internal/util/StateMachine.java", @@ -791,10 +771,6 @@ java_library { "libphonenumber-platform", "tagsoup", "rappor", - "libtextclassifier-java", - ], - required: [ - "libtextclassifier", ], dxflags: ["--core-library"], } @@ -976,7 +952,6 @@ filegroup { "core/java/android/content/pm/InstallationFileLocation.aidl", "core/java/android/content/pm/IDataLoaderStatusListener.aidl", "core/java/android/content/pm/IPackageInstallerSessionFileSystemConnector.aidl", - "core/java/android/content/pm/NamedParcelFileDescriptor.aidl", ], path: "core/java", } @@ -986,7 +961,6 @@ filegroup { srcs: [ "core/java/android/os/incremental/IIncrementalService.aidl", "core/java/android/os/incremental/IncrementalNewFileParams.aidl", - "core/java/android/os/incremental/IncrementalSignature.aidl", ], path: "core/java", } @@ -1140,16 +1114,6 @@ aidl_mapping { output: "framework-aidl-mappings.txt", } -genrule { - name: "framework-annotation-proc-index", - srcs: [":framework-annotation-proc"], - cmd: "unzip -qp $(in) unsupportedappusage/unsupportedappusage_index.csv > $(out)", - out: ["unsupportedappusage_index.csv"], - dist: { - targets: ["droidcore"], - }, -} - // 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). @@ -1304,6 +1268,13 @@ droidstubs { "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", + }, + }, defaults: ["framework-module-stubs-defaults-systemapi"], filter_packages: ["android.telephony"], sdk_version: "system_current", @@ -1321,41 +1292,6 @@ java_library { libs: ["android_system_stubs_current"], } -java_library { - name: "framework-telephony", - srcs: [ - ":framework-telephony-sources", - ":framework-telephony-shared-srcs", - ], - // TODO: change to framework-system-stub to build against system APIs. - libs: [ - "framework-minus-apex", - "unsupportedappusage", - ], - static_libs: [ - "libphonenumber-platform", - "app-compat-annotations", - ], - sdk_version: "core_platform", - aidl: { - export_include_dirs: ["telephony/java"], - include_dirs: [ - "frameworks/native/aidl/binder", - "frameworks/native/aidl/gui", - ] - }, - jarjar_rules: ":framework-telephony-jarjar-rules", - dxflags: [ - "--core-library", - "--multi-dex", - ], - // This is to break the dependency from boot jars. - dex_preopt: { - enabled: false, - }, - installable: true, -} - filegroup { // TODO (b/147690217): move to frameworks/base/telephony/common. name: "framework-telephony-annotations", |