Migrate --android_resource_shrinking, --experimental_android_resource_cycle_shrinking, --experimental_android_compress_java_resources Delete android_manifest_merger references #FLAG_CHANGE PiperOrigin-RevId: 972777320 Change-Id: I9bbbd5da407875e23e3162eb666b11919cccbc99
diff --git a/flags/BUILD b/flags/BUILD index db3d058..db1ae34 100644 --- a/flags/BUILD +++ b/flags/BUILD
@@ -164,18 +164,6 @@ visibility = ["//visibility:public"], ) -string_flag( - name = "android_manifest_merger", - build_setting_default = "android", - scope = "universal", - values = [ - "legacy", - "android", - "force_android", - ], - visibility = ["//visibility:public"], -) - bool_flag( name = "experimental_android_library_exports_manifest_default", build_setting_default = False,
diff --git a/flags/flags_wrapper.bzl b/flags/flags_wrapper.bzl index f82e922..1787747 100644 --- a/flags/flags_wrapper.bzl +++ b/flags/flags_wrapper.bzl
@@ -34,7 +34,7 @@ flags_wrapper = rule( implementation = _flags_wrapper_impl, attrs = dict( - targets = attr.label_list(), + targets = attr.label_list(allow_files = True), ), )
diff --git a/rules/flags/flags.bzl b/rules/flags/flags.bzl index 8804429..fb70f17 100644 --- a/rules/flags/flags.bzl +++ b/rules/flags/flags.bzl
@@ -190,10 +190,6 @@ return flags[0][FlagsInfo] _POSSIBLY_NATIVE_FLAGS = { - "android_manifest_merger": ( - lambda ctx: ctx.fragments.android.manifest_merger, - "native", - ), "desugar_for_android": (lambda ctx: ctx.fragments.android.desugar_java8, "native"), "desugar_java8_libs": (lambda ctx: ctx.fragments.android.desugar_java8_libs, "native"), "experimental_android_compress_java_resources": (