From f945a0c70f46588ce1203d39824377f5c399358e Mon Sep 17 00:00:00 2001 From: Sergio Campama Date: Tue, 24 May 2016 21:10:27 +0000 Subject: Support for gathering all the protos seen in the transitive closure of dependencies through the ObjcProtoAspect, compiling and linking the generated protos at the final linking target. This is only enabled for objc_proto_libraries using the portable_proto_filters attribute, and guarded with the "--experimental_auto_top_level_union_objc_protos" flag. This prevents duplicate symbol errors as the generated sources are only linked once. -- MOS_MIGRATED_REVID=123144532 --- .../google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java') diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java index 6d4f47552f..7cf1fcf323 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcCommandLineOptions.java @@ -193,6 +193,7 @@ public class ObjcCommandLineOptions extends FragmentOptions { ) public Label extraEntitlements; + // TODO(b/28451644): Make this option the default behavior. @Option( name = "experimental_auto_top_level_union_objc_protos", defaultValue = "false", @@ -212,7 +213,7 @@ public class ObjcCommandLineOptions extends FragmentOptions { + "when signing." ) public boolean deviceDebugEntitlements; - + @VisibleForTesting static final String DEFAULT_MINIMUM_IOS = "7.0"; @SuppressWarnings("unchecked") -- cgit v1.2.3