Merge "Split android_non_updatable_stubs_libs" into main (911f9201) · Commits · e / os / android_frameworks_base

api/Android.bp

+25 −18

Original line number	Diff line number	Diff line
		@@ -306,6 +306,30 @@ packages_to_document = [
		"org.xmlpull",
		]

		// These are libs from framework-internal-utils that are required (i.e. being referenced)
		// from framework-non-updatable-sources. Add more here when there's a need.
		// DO NOT add the entire framework-internal-utils. It might cause unnecessary circular
		// dependencies gets bigger.
		android_non_updatable_stubs_libs = [
		"android.hardware.cas-V1.2-java",
		"android.hardware.health-V1.0-java-constants",
		"android.hardware.radio-V1.5-java",
		"android.hardware.radio-V1.6-java",
		"android.hardware.thermal-V1.0-java-constants",
		"android.hardware.thermal-V2.0-java",
		"android.hardware.tv.input-V1.0-java-constants",
		"android.hardware.usb-V1.0-java-constants",
		"android.hardware.usb-V1.1-java-constants",
		"android.hardware.usb.gadget-V1.0-java",
		"android.hardware.vibrator-V1.3-java",
		"framework-protos",
		]

		java_defaults {
		name: "android-non-updatable-stubs-libs-defaults",
		libs: android_non_updatable_stubs_libs,
		}

		// Defaults for all stubs that include the non-updatable framework. These defaults do not include
		// module symbols, so will not compile correctly on their own. Users must add module APIs to the
		// classpath (or sources) somehow.
		@@ -333,24 +357,7 @@ stubs_defaults {
		"system/hardware/interfaces/media/aidl",
		],
		},
		// These are libs from framework-internal-utils that are required (i.e. being referenced)
		// from framework-non-updatable-sources. Add more here when there's a need.
		// DO NOT add the entire framework-internal-utils. It might cause unnecessary circular
		// dependencies gets bigger.
		libs: [
		"android.hardware.cas-V1.2-java",
		"android.hardware.health-V1.0-java-constants",
		"android.hardware.radio-V1.5-java",
		"android.hardware.radio-V1.6-java",
		"android.hardware.thermal-V1.0-java-constants",
		"android.hardware.thermal-V2.0-java",
		"android.hardware.tv.input-V1.0-java-constants",
		"android.hardware.usb-V1.0-java-constants",
		"android.hardware.usb-V1.1-java-constants",
		"android.hardware.usb.gadget-V1.0-java",
		"android.hardware.vibrator-V1.3-java",
		"framework-protos",
		],
		libs: android_non_updatable_stubs_libs,
		flags: [
		"--error NoSettingsProvider",
		"--error UnhiddenSystemApi",