Move telephony framework sources as part of non-update framework.
This allows us to hide Telephony APIs and framework can still use
them.
Bug: 151667108
Test: build
Change-Id: I7ad2eefa854da00845d1d5c2fea596628f092e92
Merged-In: I7ad2eefa854da00845d1d5c2fea596628f092e92
diff --git a/Android.bp b/Android.bp
index 48d9559..152594a 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",
@@ -285,7 +286,6 @@
":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 @@
"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",
],
@@ -523,9 +522,8 @@
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",
@@ -1326,8 +1324,8 @@
java_library {
name: "framework-telephony",
srcs: [
- ":framework-telephony-sources",
- ":framework-telephony-shared-srcs",
+ //":framework-telephony-sources",
+ //":framework-telephony-shared-srcs",
],
// TODO: change to framework-system-stub to build against system APIs.
libs: [