Merge "Created empty framework-nfc non-updatable module" into main (a7a5a261) · Commits · e / os / android_frameworks_base

Android.bp

+15 −3

Original line number	Diff line number	Diff line
		@@ -413,13 +413,25 @@ java_defaults {
		],
		}

		// Collection of non updatable unbundled jars. The list here should match
		// \|non_updatable_modules\| variable in frameworks/base/api/api.go.
		java_library {
		name: "framework-non-updatable-unbundled-impl-libs",
		static_libs: [
		"framework-location.impl",
		"framework-nfc.impl",
		],
		sdk_version: "core_platform",
		installable: false,
		}

		// Separated so framework-minus-apex-defaults can be used without the libs dependency
		java_defaults {
		name: "framework-minus-apex-with-libs-defaults",
		defaults: ["framework-minus-apex-defaults"],
		libs: [
		"framework-virtualization.stubs.module_lib",
		"framework-location.impl",
		"framework-non-updatable-unbundled-impl-libs",
		],
		}

		@@ -450,7 +462,7 @@ java_library {
		stem: "framework",
		apex_available: ["//apex_available:platform"],
		visibility: [
		"//frameworks/base/location",
		"//frameworks/base:__subpackages__",
		],
		compile_dex: false,
		headers_only: true,
		@@ -513,8 +525,8 @@ java_library {
		installable: false, // this lib is a build-only library
		static_libs: [
		"app-compat-annotations",
		"framework-location.impl",
		"framework-minus-apex",
		"framework-non-updatable-unbundled-impl-libs",
		"framework-updatable-stubs-module_libs_api",
		],
		sdk_version: "core_platform",

+5 −1

Original line number	Diff line number	Diff line
		@@ -89,6 +89,7 @@ combined_apis {
		"framework-location",
		"framework-media",
		"framework-mediaprovider",
		"framework-nfc",
		"framework-ondevicepersonalization",
		"framework-pdf",
		"framework-permission",
		@@ -398,7 +399,10 @@ java_defaults {
		stub_only_libs: ["framework-protos"],
		impl_only_libs: ["framework-minus-apex-headers"], // the framework, including hidden API
		impl_library_visibility: ["//frameworks/base"],
		defaults_visibility: ["//frameworks/base/location"],
		defaults_visibility: [
		"//frameworks/base/location",
		"//frameworks/base/nfc",
		],
		plugins: ["error_prone_android_framework"],
		errorprone: {
		javacflags: [

+1 −0

Original line number	Diff line number	Diff line
		@@ -635,6 +635,7 @@ java_defaults {
		api_contributions: [
		"framework-virtualization.stubs.source.test.api.contribution",
		"framework-location.stubs.source.test.api.contribution",
		"framework-nfc.stubs.source.test.api.contribution",
		],
		}

+2 −1

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ const conscrypt = "conscrypt.module.public.api"
		const i18n = "i18n.module.public.api"
		const virtualization = "framework-virtualization"
		const location = "framework-location"
		const nfc = "framework-nfc"

		var core_libraries_modules = []string{art, conscrypt, i18n}

		@@ -43,7 +44,7 @@ var core_libraries_modules = []string{art, conscrypt, i18n}
		// APIs.
		// In addition, the modules in this list are allowed to contribute to test APIs
		// stubs.
		var non_updatable_modules = []string{virtualization, location}
		var non_updatable_modules = []string{virtualization, location, nfc}

		// The intention behind this soong plugin is to generate a number of "merged"
		// API-related modules that would otherwise require a large amount of very

0 → 100644

+51 −0

Original line number	Diff line number	Diff line
		package {
		// See: http://go/android-license-faq
		// A large-scale-change added 'default_applicable_licenses' to import
		// all of the 'license_kinds' from "frameworks_base_license"
		// to get the below license kinds:
		// SPDX-license-identifier-Apache-2.0
		default_applicable_licenses: ["frameworks_base_license"],
		}

		filegroup {
		name: "framework-nfc-non-updatable-sources",
		path: "java",
		srcs: [],
		}

		filegroup {
		name: "framework-nfc-updatable-sources",
		path: "java",
		srcs: [
		"java/*/.java",
		"java/*/.aidl",
		],
		exclude_srcs: [
		":framework-nfc-non-updatable-sources",
		],
		}

		java_sdk_library {
		name: "framework-nfc",
		libs: [
		"unsupportedappusage", // for android.compat.annotation.UnsupportedAppUsage
		],
		srcs: [
		":framework-nfc-updatable-sources",
		],
		defaults: ["framework-non-updatable-unbundled-defaults"],
		permitted_packages: [
		"android.nfc",
		"com.android.nfc",
		],
		hidden_api_packages: [
		"com.android.nfc",
		],
		aidl: {
		include_dirs: [
		// TODO (b/303286040): Remove these when we change to \|framework-module-defaults\|
		"frameworks/base/nfc/java",
		"frameworks/base/core/java",
		],
		},
		}