Merge "Ready more build rules for dir move" into udc-dev (9d7cd379) · Commits · e / os / android_frameworks_base

Android.bp

+4 −7

Original line number	Original line	Diff line number	Diff line
	@@ -606,7 +606,7 @@ filegroup {
	"core/java/*/.logtags",		"core/java/*/.logtags",
	"**/package.html",		"**/package.html",
	],		],
	visibility: ["//visibility:private"],		visibility: ["//frameworks/base/api"],
	}		}

	// Defaults for all stubs that include the non-updatable framework. These defaults do not include		// Defaults for all stubs that include the non-updatable framework. These defaults do not include
	@@ -620,12 +620,10 @@ stubs_defaults {
	java_version: "1.8",		java_version: "1.8",
	arg_files: [":frameworks-base-core-AndroidManifest.xml"],		arg_files: [":frameworks-base-core-AndroidManifest.xml"],
	aidl: {		aidl: {
	local_include_dirs: [
	"media/aidl",
	"telephony/java",
	],
	include_dirs: [		include_dirs: [
	"frameworks/av/aidl",		"frameworks/av/aidl",
			"frameworks/base/media/aidl",
			"frameworks/base/telephony/java",
	"frameworks/native/libs/permission/aidl",		"frameworks/native/libs/permission/aidl",
	"packages/modules/Bluetooth/framework/aidl-export",		"packages/modules/Bluetooth/framework/aidl-export",
	"packages/modules/Connectivity/framework/aidl-export",		"packages/modules/Connectivity/framework/aidl-export",
	@@ -661,7 +659,7 @@ stubs_defaults {
	annotations_enabled: true,		annotations_enabled: true,
	previous_api: ":android.api.public.latest",		previous_api: ":android.api.public.latest",
	merge_annotations_dirs: ["metalava-manual"],		merge_annotations_dirs: ["metalava-manual"],
	defaults_visibility: ["//visibility:private"],		defaults_visibility: ["//frameworks/base/api"],
	visibility: ["//frameworks/base/api"],		visibility: ["//frameworks/base/api"],
	}		}

	@@ -689,7 +687,6 @@ stubs_defaults {
	// NOTE: The below can be removed once the prebuilt stub contains IKE.		// NOTE: The below can be removed once the prebuilt stub contains IKE.
	"sdk_system_current_android.net.ipsec.ike",		"sdk_system_current_android.net.ipsec.ike",
	],		],
	defaults_visibility: ["//visibility:private"],
	}		}

	build = [		build = [

ApiDocs.bp

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -182,10 +182,10 @@ droidstubs {
	// using droiddoc		// using droiddoc
	/////////////////////////////////////////////////////////////////////		/////////////////////////////////////////////////////////////////////

	framework_docs_only_args = " -android -manifest $(location core/res/AndroidManifest.xml) " +		framework_docs_only_args = " -android -manifest $(location :frameworks-base-core-AndroidManifest.xml) " +
	"-metalavaApiSince " +		"-metalavaApiSince " +
	"-werror -lerror -hide 111 -hide 113 -hide 125 -hide 126 -hide 127 -hide 128 " +		"-werror -lerror -hide 111 -hide 113 -hide 125 -hide 126 -hide 127 -hide 128 " +
	"-overview $(location core/java/overview.html) " +		"-overview $(location :frameworks-base-java-overview) " +
	// Federate Support Library references against local API file.		// Federate Support Library references against local API file.
	"-federate SupportLib https://developer.android.com " +		"-federate SupportLib https://developer.android.com " +
	"-federationapi SupportLib $(location :current-support-api) " +		"-federationapi SupportLib $(location :current-support-api) " +
	@@ -218,16 +218,16 @@ doc_defaults {
	"sdk.preview 0",		"sdk.preview 0",
	],		],
	arg_files: [		arg_files: [
	"core/res/AndroidManifest.xml",		":frameworks-base-core-AndroidManifest.xml",
	"core/java/overview.html",		":frameworks-base-java-overview",
	":current-support-api",		":current-support-api",
	":current-androidx-api",		":current-androidx-api",
	],		],
	// TODO(b/169090544): remove below aidl includes.		// TODO(b/169090544): remove below aidl includes.
	aidl: {		aidl: {
	local_include_dirs: ["media/aidl"],
	include_dirs: [		include_dirs: [
	"frameworks/av/aidl",		"frameworks/av/aidl",
			"frameworks/base/media/aidl",
	"frameworks/native/libs/permission/aidl",		"frameworks/native/libs/permission/aidl",
	],		],
	},		},

StubLibraries.bp

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -515,6 +515,7 @@ droidstubs {
	],		],
	api_levels_sdk_type: "public",		api_levels_sdk_type: "public",
	extensions_info_file: ":sdk-extensions-info",		extensions_info_file: ":sdk-extensions-info",
			visibility: ["//frameworks/base"],
	}		}

	droidstubs {		droidstubs {

core/java/Android.bp

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -421,6 +421,11 @@ aidl_interface {
	},		},
	}		}

			filegroup {
			name: "frameworks-base-java-overview",
			srcs: ["overview.html"],
			}

	// Avoid including Parcelable classes as we don't want to have two copies of		// 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)		// Parcelable cross the libraries. This is used by telephony-common (frameworks/opt/telephony)
	// and TeleService app (packages/services/Telephony).		// and TeleService app (packages/services/Telephony).

mime/java/Android.bp

+4 −1

Original line number	Original line	Diff line number	Diff line
	@@ -10,5 +10,8 @@ package {
	filegroup {		filegroup {
	name: "framework-mime-sources",		name: "framework-mime-sources",
	srcs: ["*/.java"],		srcs: ["*/.java"],
	visibility: ["//frameworks/base"],		visibility: [
			"//frameworks/base",
			"//frameworks/base/api",
			],
	}		}