diff options
author | Googler <noreply@google.com> | 2017-07-14 16:12:23 +0200 |
---|---|---|
committer | László Csomor <laszlocsomor@google.com> | 2017-07-14 16:35:34 +0200 |
commit | 4277d438bcf5d78e10c8ce09cdddf2edd3a31392 (patch) | |
tree | dac34c9c78d1e3f36552e35c77fe244344cd0056 /src/main/java/com/google/devtools/build/lib | |
parent | 23491493c10da4836672080764678794544ba084 (diff) |
Remove unused native aspect for ASwB
RELNOTES: None.
PiperOrigin-RevId: 161952410
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib')
3 files changed, 0 insertions, 93 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/BUILD b/src/main/java/com/google/devtools/build/lib/BUILD index 2ef67af04f..cd5e566d61 100644 --- a/src/main/java/com/google/devtools/build/lib/BUILD +++ b/src/main/java/com/google/devtools/build/lib/BUILD @@ -697,7 +697,6 @@ java_library( ":collect", ":concurrent", ":events", - ":ideinfo", ":java-compilation", ":java-rules", ":packages-internal", @@ -1125,30 +1124,6 @@ java_library( ) java_library( - name = "ideinfo", - srcs = glob( - ["ideinfo/*.java"], - ), - deps = [ - ":android-rules", - ":build-base", - ":collect", - ":concurrent", - ":java-compilation", - ":java-rules", - ":packages-internal", - ":util", - ":vfs", - "//src/main/java/com/google/devtools/build/lib/actions", - "//src/main/java/com/google/devtools/build/lib/rules/cpp", - "//src/main/protobuf:intellij_ide_info_java_proto", - "//third_party:guava", - "//third_party:jsr305", - "//third_party/protobuf:protobuf_java", - ], -) - -java_library( name = "shared-base-rules", exports = [ ":android-rules", diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java index c2e046f1b4..86b5e20cad 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/BazelRuleClassProvider.java @@ -77,7 +77,6 @@ import com.google.devtools.build.lib.bazel.rules.workspace.MavenServerRule; import com.google.devtools.build.lib.bazel.rules.workspace.NewGitRepositoryRule; import com.google.devtools.build.lib.bazel.rules.workspace.NewHttpArchiveRule; import com.google.devtools.build.lib.cmdline.Label; -import com.google.devtools.build.lib.ideinfo.AndroidStudioInfoAspect; import com.google.devtools.build.lib.packages.Attribute.LateBoundLabel; import com.google.devtools.build.lib.rules.Alias.AliasRule; import com.google.devtools.build.lib.rules.android.AarImportBaseRule; @@ -658,20 +657,6 @@ public class BazelRuleClassProvider { } }; - public static final RuleSet ANDROID_STUDIO_ASPECT = - new RuleSet() { - @Override - public void init(Builder builder) { - AndroidStudioInfoAspect androidStudioInfoAspect = new AndroidStudioInfoAspect(); - builder.addNativeAspectClass(androidStudioInfoAspect); - } - - @Override - public ImmutableList<RuleSet> requires() { - return ImmutableList.of(CORE_RULES); - } - }; - public static final RuleSet VARIOUS_WORKSPACE_RULES = new RuleSet() { @Override @@ -714,7 +699,6 @@ public class BazelRuleClassProvider { PYTHON_RULES, OBJC_RULES, J2OBJC_RULES, - ANDROID_STUDIO_ASPECT, TESTING_SUPPORT, VARIOUS_WORKSPACE_RULES, // This rule set is a little special: it needs to depend on every configuration fragment diff --git a/src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspect.java b/src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspect.java deleted file mode 100644 index 59c0fbf5d4..0000000000 --- a/src/main/java/com/google/devtools/build/lib/ideinfo/AndroidStudioInfoAspect.java +++ /dev/null @@ -1,52 +0,0 @@ -// Copyright 2014 The Bazel Authors. All rights reserved. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package com.google.devtools.build.lib.ideinfo; - -import com.google.devtools.build.lib.analysis.ConfiguredAspect; -import com.google.devtools.build.lib.analysis.ConfiguredAspect.Builder; -import com.google.devtools.build.lib.analysis.ConfiguredAspectFactory; -import com.google.devtools.build.lib.analysis.ConfiguredTarget; -import com.google.devtools.build.lib.analysis.RuleContext; -import com.google.devtools.build.lib.packages.AspectDefinition; -import com.google.devtools.build.lib.packages.AspectParameters; -import com.google.devtools.build.lib.packages.NativeAspectClass; - -/** Generates ide-build information for Android Studio. */ -public class AndroidStudioInfoAspect extends NativeAspectClass implements ConfiguredAspectFactory { - public static final String NAME = "AndroidStudioInfoAspect"; - - @Override - public String getName() { - return NAME; - } - - @Override - public AspectDefinition getDefinition(AspectParameters aspectParameters) { - return new AspectDefinition.Builder(this).build(); - } - - @Override - public ConfiguredAspect create( - ConfiguredTarget base, RuleContext ruleContext, AspectParameters parameters) { - // Deprecated for bazel > 0.45 - // Can be completely removed after a version or two - ruleContext.ruleError( - "AndroidStudioInfoAspect is deprecated. " - + "If you are using an IntelliJ bazel plugin, " - + "please update to the latest plugin version from the Jetbrains plugin repository."); - ConfiguredAspect.Builder builder = new Builder(this, parameters, ruleContext); - return builder.build(); - } -} |