(2/4) Empty APIs for SupplementalApi module. (403eb57a) · Commits · e / os / android_frameworks_base

Android.bp

+28 −2

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,18 @@
	//		//
	// READ ME: ########################################################		// READ ME: ########################################################

			// TODO(b/21090328): Remove filter after we are ready to.
			soong_config_module_type {
			name: "java_library_with_nonpublic_deps",
			module_type: "java_library",
			config_namespace: "ANDROID",
			bool_variables: ["include_nonpublic_framework_api"],
			properties: [
			"static_libs",
			"libs",
			],
			}

	package {		package {
	default_applicable_licenses: ["frameworks_base_license"],		default_applicable_licenses: ["frameworks_base_license"],
	}		}
	@@ -142,7 +154,7 @@ filegroup {
	],		],
	}		}

	java_library {		java_library_with_nonpublic_deps {
	name: "framework-updatable-stubs-module_libs_api",		name: "framework-updatable-stubs-module_libs_api",
	static_libs: [		static_libs: [
	"android.net.ipsec.ike.stubs.module_lib",		"android.net.ipsec.ike.stubs.module_lib",
	@@ -161,11 +173,18 @@ java_library {
	"framework-uwb.stubs.module_lib",		"framework-uwb.stubs.module_lib",
	"framework-wifi.stubs.module_lib",		"framework-wifi.stubs.module_lib",
	],		],
			soong_config_variables: {
			include_nonpublic_framework_api: {
			static_libs: [
			"framework-supplementalapi.stubs.module_lib",
			],
			},
			},
	sdk_version: "module_current",		sdk_version: "module_current",
	visibility: ["//visibility:private"],		visibility: ["//visibility:private"],
	}		}

	java_library {		java_library_with_nonpublic_deps {
	name: "framework-all",		name: "framework-all",
	installable: false,		installable: false,
	static_libs: [		static_libs: [
	@@ -186,6 +205,13 @@ java_library {
	"framework-wifi.impl",		"framework-wifi.impl",
	"updatable-media",		"updatable-media",
	],		],
			soong_config_variables: {
			include_nonpublic_framework_api: {
			static_libs: [
			"framework-supplementalapi.stubs.module_lib",
			],
			},
			},
	apex_available: ["//apex_available:platform"],		apex_available: ["//apex_available:platform"],
	sdk_version: "core_platform",		sdk_version: "core_platform",
	visibility: [		visibility: [

StubLibraries.bp

+56 −6

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,14 @@
	// and comparing them against the checked in API signature, and also checking compatibility		// and comparing them against the checked in API signature, and also checking compatibility
	// with the latest frozen API signature.		// with the latest frozen API signature.

			// TODO(b/21090328): Remove filter after we are ready to.
			soong_config_module_type_import {
			from: "frameworks/base/Android.bp",
			module_types: [
			"java_library_with_nonpublic_deps",
			],
			}

	/////////////////////////////////////////////////////////////////////		/////////////////////////////////////////////////////////////////////
	// Common metalava configs		// Common metalava configs
	/////////////////////////////////////////////////////////////////////		/////////////////////////////////////////////////////////////////////
	@@ -299,21 +307,35 @@ java_defaults {
	visibility: ["//visibility:private"],		visibility: ["//visibility:private"],
	}		}

	java_library {		java_library_with_nonpublic_deps {
	name: "android-non-updatable.stubs",		name: "android-non-updatable.stubs",
	defaults: ["android-non-updatable_defaults_stubs_current"],		defaults: ["android-non-updatable_defaults_stubs_current"],
	srcs: [":api-stubs-docs-non-updatable"],		srcs: [":api-stubs-docs-non-updatable"],
	libs: modules_public_stubs,		libs: modules_public_stubs,
			soong_config_variables: {
			include_nonpublic_framework_api: {
			libs: [
			"framework-supplementalapi.stubs",
			],
			},
			},
	dist: {		dist: {
	dir: "apistubs/android/public",		dir: "apistubs/android/public",
	},		},
	}		}

	java_library {		java_library_with_nonpublic_deps {
	name: "android-non-updatable.stubs.system",		name: "android-non-updatable.stubs.system",
	defaults: ["android-non-updatable_defaults_stubs_current"],		defaults: ["android-non-updatable_defaults_stubs_current"],
	srcs: [":system-api-stubs-docs-non-updatable"],		srcs: [":system-api-stubs-docs-non-updatable"],
	libs: modules_system_stubs,		libs: modules_system_stubs,
			soong_config_variables: {
			include_nonpublic_framework_api: {
			libs: [
			"framework-supplementalapi.stubs",
			],
			},
			},
	dist: {		dist: {
	dir: "apistubs/android/system",		dir: "apistubs/android/system",
	},		},
	@@ -334,11 +356,18 @@ java_library {
	},		},
	}		}

	java_library {		java_library_with_nonpublic_deps {
	name: "android-non-updatable.stubs.test",		name: "android-non-updatable.stubs.test",
	defaults: ["android-non-updatable_defaults_stubs_current"],		defaults: ["android-non-updatable_defaults_stubs_current"],
	srcs: [":test-api-stubs-docs-non-updatable"],		srcs: [":test-api-stubs-docs-non-updatable"],
	libs: modules_system_stubs,		libs: modules_system_stubs,
			soong_config_variables: {
			include_nonpublic_framework_api: {
			libs: [
			"framework-supplementalapi.stubs",
			],
			},
			},
	dist: {		dist: {
	dir: "apistubs/android/test",		dir: "apistubs/android/test",
	},		},
	@@ -357,21 +386,35 @@ java_defaults {
	defaults_visibility: ["//frameworks/base/services"],		defaults_visibility: ["//frameworks/base/services"],
	}		}

	java_library {		java_library_with_nonpublic_deps {
	name: "android_stubs_current",		name: "android_stubs_current",
	static_libs: modules_public_stubs + [		static_libs: modules_public_stubs + [
	"android-non-updatable.stubs",		"android-non-updatable.stubs",
	"private-stub-annotations-jar",		"private-stub-annotations-jar",
	],		],
			soong_config_variables: {
			include_nonpublic_framework_api: {
			static_libs: [
			"framework-supplementalapi.stubs",
			],
			},
			},
	defaults: ["android.jar_defaults"],		defaults: ["android.jar_defaults"],
	}		}

	java_library {		java_library_with_nonpublic_deps {
	name: "android_system_stubs_current",		name: "android_system_stubs_current",
	static_libs: modules_system_stubs + [		static_libs: modules_system_stubs + [
	"android-non-updatable.stubs.system",		"android-non-updatable.stubs.system",
	"private-stub-annotations-jar",		"private-stub-annotations-jar",
	],		],
			soong_config_variables: {
			include_nonpublic_framework_api: {
			static_libs: [
			"framework-supplementalapi.stubs",
			],
			},
			},
	defaults: [		defaults: [
	"android.jar_defaults",		"android.jar_defaults",
	"android_stubs_dists_default",		"android_stubs_dists_default",
	@@ -392,7 +435,7 @@ java_library {
	],		],
	}		}

	java_library {		java_library_with_nonpublic_deps {
	name: "android_test_stubs_current",		name: "android_test_stubs_current",
	// Modules do not have test APIs, but we want to include their SystemApis, like we include		// Modules do not have test APIs, but we want to include their SystemApis, like we include
	// the SystemApi of framework-non-updatable-sources.		// the SystemApi of framework-non-updatable-sources.
	@@ -400,6 +443,13 @@ java_library {
	"android-non-updatable.stubs.test",		"android-non-updatable.stubs.test",
	"private-stub-annotations-jar",		"private-stub-annotations-jar",
	],		],
			soong_config_variables: {
			include_nonpublic_framework_api: {
			static_libs: [
			"framework-supplementalapi.stubs",
			],
			},
			},
	defaults: [		defaults: [
	"android.jar_defaults",		"android.jar_defaults",
	"android_stubs_dists_default",		"android_stubs_dists_default",