diff options
author | Rumou Duan <rduan@google.com> | 2017-02-24 22:10:55 +0000 |
---|---|---|
committer | Yue Gan <yueg@google.com> | 2017-02-27 15:05:57 +0000 |
commit | d00e44684f1513fff532c0008560ade17ea390f3 (patch) | |
tree | 4e7c6c04af4beb152b169e716040d1becbe5cab4 /src/main/java/com/google/devtools/build/lib/rules | |
parent | 11318ec510b41c6c0398a4e40f4a65fbb603a26d (diff) |
Remove flag --experimental_j2objc_srcjar_processing, and always use the new J2ObjC source jar transpilation support.
--
PiperOrigin-RevId: 148501938
MOS_MIGRATED_REVID=148501938
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules')
3 files changed, 7 insertions, 35 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java index e31e44756b..237b124c1d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java @@ -323,19 +323,9 @@ public class J2ObjcAspect extends NativeAspectClass implements ConfiguredAspectF ImmutableSet.Builder<Artifact> javaSourceJarsBuilder = ImmutableSet.builder(); if (sourceInfoProvider != null) { javaSourceFilesBuilder.addAll(sourceInfoProvider.getSourceFiles()); - - if (ruleContext.getFragment(J2ObjcConfiguration.class).experimentalSrcJarProcessing()) { - javaSourceJarsBuilder - .addAll(sourceInfoProvider.getSourceJars()) - .addAll(sourceInfoProvider.getSourceJarsForJarFiles()); - } else { - // The old source jar support treates source jars as source files, in the sense that - // we generate a single concatenated ObjC header and source files for all sources inside - // a given Java source jar. - javaSourceFilesBuilder - .addAll(sourceInfoProvider.getSourceJars()) - .addAll(sourceInfoProvider.getSourceJarsForJarFiles()); - } + javaSourceJarsBuilder + .addAll(sourceInfoProvider.getSourceJars()) + .addAll(sourceInfoProvider.getSourceJarsForJarFiles()); } if (genJarProvider != null && genJarProvider.getGenSourceJar() != null) { diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcCommandLineOptions.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcCommandLineOptions.java index d5120980e4..b54ef9ee84 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcCommandLineOptions.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcCommandLineOptions.java @@ -51,14 +51,6 @@ public class J2ObjcCommandLineOptions extends FragmentOptions { ) public boolean explicitJreDeps; - @Option(name = "experimental_j2objc_srcjar_processing", - defaultValue = "true", - category = "flags", - help = "Whether to generate individual ObjC header files for each Java source file inside " - + "Java source jars." - ) - public boolean experimentalSrcJarProcessing; - @Override public void addAllLabels(Multimap<String, Label> labelMap) {} } diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcConfiguration.java index 407f5fb352..bfe3074c5d 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcConfiguration.java @@ -40,7 +40,7 @@ public class J2ObjcConfiguration extends Fragment { * transpiler, and cannot be overriden by user-specified flags in {@link * J2ObjcCommandLineOptions}. See http://j2objc.org/docs/j2objc.html for flag documentation. */ - private static final List<String> J2OBJC_ALWAYS_ON_TRANSLATION_FLAGS = ImmutableList.of( + private static final ImmutableList<String> J2OBJC_ALWAYS_ON_TRANSLATION_FLAGS = ImmutableList.of( "-encoding", "UTF-8", "--doc-comments", @@ -51,13 +51,14 @@ public class J2ObjcConfiguration extends Fragment { * transpiler, but can be overriden by user-specified flags in {@link J2ObjcCommandLineOptions}. * See http://j2objc.org/docs/j2objc.html for flag documentation. */ - private static final List<String> J2OBJC_DEFAULT_TRANSLATION_FLAGS = ImmutableList.of("-g"); + private static final ImmutableList<String> J2OBJC_DEFAULT_TRANSLATION_FLAGS = + ImmutableList.of("-g"); /** * Disallowed flags for J2ObjC translation. See http://j2objc.org/docs/j2objc.html for flag * documentation. */ - static final List<String> J2OBJC_BLACKLISTED_TRANSLATION_FLAGS = + static final ImmutableList<String> J2OBJC_BLACKLISTED_TRANSLATION_FLAGS = ImmutableList.of("--prefixes", "--prefix", "-x"); static final String INVALID_TRANSLATION_FLAGS_MSG_TEMPLATE = @@ -86,7 +87,6 @@ public class J2ObjcConfiguration extends Fragment { private final List<String> translationFlags; private final boolean removeDeadCode; private final boolean explicitJreDeps; - private final boolean experimentalSrcJarProcessing; J2ObjcConfiguration(J2ObjcCommandLineOptions j2ObjcOptions) { this.removeDeadCode = j2ObjcOptions.removeDeadCode; @@ -96,7 +96,6 @@ public class J2ObjcConfiguration extends Fragment { .addAll(j2ObjcOptions.translationFlags) .addAll(J2OBJC_ALWAYS_ON_TRANSLATION_FLAGS) .build(); - this.experimentalSrcJarProcessing = j2ObjcOptions.experimentalSrcJarProcessing; } /** @@ -128,15 +127,6 @@ public class J2ObjcConfiguration extends Fragment { return explicitJreDeps; } - /** - * Returns whether to use experimental source jar processing support. The new support produces - * one header for each Java source file inside a given source jar, instead of one big concatenated - * header for all source files from the source jar. - */ - public boolean experimentalSrcJarProcessing() { - return experimentalSrcJarProcessing; - } - @Override public void reportInvalidOptions(EventHandler reporter, BuildOptions buildOptions) { if (!Collections.disjoint(translationFlags, J2OBJC_BLACKLISTED_TRANSLATION_FLAGS)) { |