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

AconfigFlags.bp

+27 −21

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

		// 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: [
		aconfig_srcjars = [
		":android.app.usage.flags-aconfig-java{.generated_srcjars}",
		":android.content.pm.flags-aconfig-java{.generated_srcjars}",
		":android.os.flags-aconfig-java{.generated_srcjars}",
		@@ -36,7 +31,18 @@ java_defaults {
		":com.android.media.flags.bettertogether-aconfig-java{.generated_srcjars}",
		":sdk_sandbox_flags_lib{.generated_srcjars}",
		":android.permission.flags-aconfig-java{.generated_srcjars}",
		],
		]

		filegroup {
		name: "framework-minus-apex-aconfig-srcjars",
		srcs: aconfig_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: aconfig_srcjars,
		// Add aconfig-annotations-lib as a dependency for the optimization
		libs: ["aconfig-annotations-lib"],
		}

+3 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,9 @@

		droidstubs {
		name: "api-stubs-docs-non-updatable",
		srcs: [
		":framework-minus-apex-aconfig-srcjars",
		],
		defaults: [
		"android-non-updatable-stubs-defaults",
		"module-classpath-stubs-defaults",

+48 −48

File changed.

Preview size limit exceeded, changes collapsed.