Merge "Move telephony framework sources as part of non-update framework." into rvc-dev (d961f717) · Commits · e / os / android_frameworks_base

Android.bp

+4 −6

Original line number	Original line	Diff line number	Diff line
	@@ -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",
	@@ -285,7 +286,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",
	@@ -300,7 +300,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",
	],		],
	@@ -523,9 +522,8 @@ 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/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",
	@@ -1327,8 +1325,8 @@ java_library {
	java_library {		java_library {
	name: "framework-telephony",		name: "framework-telephony",
	srcs: [		srcs: [
	":framework-telephony-sources",		//":framework-telephony-sources",
	":framework-telephony-shared-srcs",		//":framework-telephony-shared-srcs",
	],		],
	// TODO: change to framework-system-stub to build against system APIs.		// TODO: change to framework-system-stub to build against system APIs.
	libs: [		libs: [