Merge "Expand @FlaggedApi(FLAG) constants in API signature files" into main (7b4ab317) · Commits · e / os / android_frameworks_base

AconfigFlags.bp

+12 −5

Original line number	Original line	Diff line number	Diff line
	@@ -12,11 +12,8 @@
	// See the License for the specific language governing permissions and		// See the License for the specific language governing permissions and
	// limitations under the License.		// limitations under the License.

	// Aconfig declarations and libraries for the core framework		filegroup {
	java_defaults {		name: "framework-minus-apex-aconfig-srcjars",
	name: "framework-minus-apex-aconfig-libraries",

	// Add java_aconfig_libraries to here to add them to the core framework
	srcs: [		srcs: [
	":android.app.usage.flags-aconfig-java{.generated_srcjars}",		":android.app.usage.flags-aconfig-java{.generated_srcjars}",
	":android.content.pm.flags-aconfig-java{.generated_srcjars}",		":android.content.pm.flags-aconfig-java{.generated_srcjars}",
	@@ -36,6 +33,16 @@ java_defaults {
	":com.android.media.flags.bettertogether-aconfig-java{.generated_srcjars}",		":com.android.media.flags.bettertogether-aconfig-java{.generated_srcjars}",
	":sdk_sandbox_flags_lib{.generated_srcjars}",		":sdk_sandbox_flags_lib{.generated_srcjars}",
	],		],
			}

			// Aconfig declarations and libraries for the core framework
			java_defaults {
			name: "framework-minus-apex-aconfig-libraries",

			// Add java_aconfig_libraries to here to add them to the core framework
			srcs: [
			":framework-minus-apex-aconfig-srcjars",
			],
	// Add aconfig-annotations-lib as a dependency for the optimization		// Add aconfig-annotations-lib as a dependency for the optimization
	libs: ["aconfig-annotations-lib"],		libs: ["aconfig-annotations-lib"],
	}		}

api/StubLibraries.bp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -33,6 +33,9 @@ droidstubs {
	"android-non-updatable-stubs-defaults",		"android-non-updatable-stubs-defaults",
	"module-classpath-stubs-defaults",		"module-classpath-stubs-defaults",
	],		],
			srcs: [
			":framework-minus-apex-aconfig-srcjars",
			],
	args: metalava_framework_docs_args + "--error UnflaggedApi ",		args: metalava_framework_docs_args + "--error UnflaggedApi ",
	check_api: {		check_api: {
	current: {		current: {

core/api/current.txt

+47 −47

File changed.

Preview size limit exceeded, changes collapsed.