drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move telephony framework sources as part of non-update framework.

Browse Source 
This allows us to hide Telehony APIs and framework can still use
them.

Bug: 151667108
Test: build
Change-Id: I7ad2eefa854da00845d1d5c2fea596628f092e92
This commit is contained in:
Malcolm Chen 2020-03-16 15:28:35 -07:00 committed by Xiangyu/Malcolm Chen
parent dc99af4180
commit fbc5c36e86
1 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
Android.bp
View File

@ -239,6 +239,7 @@ filegroup {
":framework-sax-sources", ":framework-sax-sources",
":framework-telecomm-sources", ":framework-telecomm-sources",
":framework-telephony-common-sources", ":framework-telephony-common-sources",
":framework-telephony-sources",
":framework-wifi-annotations", ":framework-wifi-annotations",
":framework-wifi-non-updatable-sources", ":framework-wifi-non-updatable-sources",
":PacProcessor-aidl-sources", ":PacProcessor-aidl-sources",
@ -286,7 +287,6 @@ filegroup {
":framework-permission-sources", ":framework-permission-sources",
":framework-sdkextensions-sources", ":framework-sdkextensions-sources",
":framework-statsd-sources", ":framework-statsd-sources",
":framework-telephony-sources",
":framework-tethering-srcs", ":framework-tethering-srcs",
":framework-wifi-updatable-sources", ":framework-wifi-updatable-sources",
":updatable-media-srcs", ":updatable-media-srcs",
@ -302,7 +302,6 @@ java_library {
"framework-permission-stubs-module_libs_api", "framework-permission-stubs-module_libs_api",
"framework-sdkextensions-stubs-module_libs_api", "framework-sdkextensions-stubs-module_libs_api",
"framework-statsd-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-tethering-stubs-module_libs_api",
"framework-wifi-stubs-module_libs_api", "framework-wifi-stubs-module_libs_api",
], ],
@ -526,11 +525,11 @@ java_library {
defaults: ["framework-aidl-export-defaults"], defaults: ["framework-aidl-export-defaults"],
installable: false, // this lib is a build-only library installable: false, // this lib is a build-only library
static_libs: [ static_libs: [
"app-compat-annotations",
"framework-minus-apex", "framework-minus-apex",
// TODO(b/146218515): should be removed // TODO(b/146218515): should be removed
"framework-appsearch", "framework-appsearch",
// TODO (b/147688669) should be removed // TODO (b/147688669) should be removed
"framework-telephony",
"framework-updatable-stubs-module_libs_api", "framework-updatable-stubs-module_libs_api",
], ],
sdk_version: "core_platform", sdk_version: "core_platform",
@ -1320,40 +1319,41 @@ java_library {
libs: ["android_system_stubs_current"], libs: ["android_system_stubs_current"],
} }
java_library { // TODO: b/151667108 uncomment to make it a separate module again.
name: "framework-telephony", //java_library {
srcs: [ // name: "framework-telephony",
":framework-telephony-sources", // srcs: [
":framework-telephony-shared-srcs", // ":framework-telephony-sources",
], // ":framework-telephony-shared-srcs",
// TODO: change to framework-system-stub to build against system APIs. // ],
libs: [ // // TODO: change to framework-system-stub to build against system APIs.
"framework-minus-apex", // libs: [
"unsupportedappusage", // "framework-minus-apex",
], // "unsupportedappusage",
static_libs: [ // ],
"libphonenumber-platform", // static_libs: [
"app-compat-annotations", // "libphonenumber-platform",
], // "app-compat-annotations",
sdk_version: "core_platform", // ],
aidl: { // sdk_version: "core_platform",
export_include_dirs: ["telephony/java"], // aidl: {
include_dirs: [ // export_include_dirs: ["telephony/java"],
"frameworks/native/aidl/binder", // include_dirs: [
"frameworks/native/aidl/gui", // "frameworks/native/aidl/binder",
] // "frameworks/native/aidl/gui",
}, // ]
jarjar_rules: ":framework-telephony-jarjar-rules", // },
dxflags: [ // jarjar_rules: ":framework-telephony-jarjar-rules",
"--core-library", // dxflags: [
"--multi-dex", // "--core-library",
], // "--multi-dex",
// This is to break the dependency from boot jars. // ],
dex_preopt: { // // This is to break the dependency from boot jars.
enabled: false, // dex_preopt: {
}, // enabled: false,
installable: true, // },
} // installable: true,
//}
filegroup { filegroup {
// TODO (b/147690217): move to frameworks/base/telephony/common. // TODO (b/147690217): move to frameworks/base/telephony/common.