Move telephony framework sources as part of non-update framework.
This allows us to hide Telehony APIs and framework can still use
them.
Bug: 151667108
Test: build
Change-Id: I7ad2eefa854da00845d1d5c2fea596628f092e92
diff --git a/Android.bp b/Android.bp
index c4dff97..fa33274 100644
--- a/Android.bp
+++ b/Android.bp
@@ -239,6 +239,7 @@
":framework-sax-sources",
":framework-telecomm-sources",
":framework-telephony-common-sources",
+ ":framework-telephony-sources",
":framework-wifi-annotations",
":framework-wifi-non-updatable-sources",
":PacProcessor-aidl-sources",
@@ -286,7 +287,6 @@
":framework-permission-sources",
":framework-sdkextensions-sources",
":framework-statsd-sources",
- ":framework-telephony-sources",
":framework-tethering-srcs",
":framework-wifi-updatable-sources",
":updatable-media-srcs",
@@ -302,7 +302,6 @@
"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",
],
@@ -526,11 +525,11 @@
defaults: ["framework-aidl-export-defaults"],
installable: false, // this lib is a build-only library
static_libs: [
+ "app-compat-annotations",
"framework-minus-apex",
// TODO(b/146218515): should be removed
"framework-appsearch",
// TODO (b/147688669) should be removed
- "framework-telephony",
"framework-updatable-stubs-module_libs_api",
],
sdk_version: "core_platform",
@@ -1320,40 +1319,41 @@
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,
-}
+// TODO: b/151667108 uncomment to make it a separate module again.
+//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.