commit 13d05648325a3034a8e4a6c8b7f3dd3d3d7e904f
author Googler <noreply@google.com> Fri Oct 14 21:47:39 2016 +0000
committer Brendan Douglas <brendandouglas@google.com> Fri Oct 14 17:48:02 2016 -0400
tree 5adcd9e577dd78ac8ac202af9280cba0d97c7656
parent 7c5f91581c035acc52bbb206adfc5690c4f2d1ad

Merged commit includes the following changes:

PiperOrigin-RevId: 136200939

base/resources/binaries/bazel-buildifier

diff --git a/base/resources/binaries/bazel-buildifier b/base/resources/binaries/bazel-buildifier
new file mode 100755
index 0000000..c7347bb
--- /dev/null
+++ b/base/resources/binaries/bazel-buildifier
Binary files differ

clwb/src/META-INF/clwb.xml

diff --git a/clwb/src/META-INF/clwb.xml b/clwb/src/META-INF/clwb.xml
index 4cc92ef..4e871ca 100644
--- a/clwb/src/META-INF/clwb.xml
+++ b/clwb/src/META-INF/clwb.xml
@@ -17,6 +17,8 @@
   <vendor>Google</vendor>
 
   <depends>com.intellij.modules.clion</depends>
+  <depends>com.intellij.modules.cidr.lang</depends>
+  <depends>com.intellij.modules.cidr.debugger</depends>
 
   <extensions defaultExtensionNs="com.intellij">
     <applicationService serviceInterface="com.google.idea.blaze.base.plugin.BlazePluginId"

cpp/src/META-INF/blaze-cpp.xml

diff --git a/cpp/src/META-INF/blaze-cpp.xml b/cpp/src/META-INF/blaze-cpp.xml
index 1cb99ea..8b78eca 100644
--- a/cpp/src/META-INF/blaze-cpp.xml
+++ b/cpp/src/META-INF/blaze-cpp.xml
@@ -14,9 +14,6 @@
   ~ limitations under the License.
   -->
 <idea-plugin>
-  <depends>com.intellij.modules.cidr.lang</depends>
-  <depends>com.intellij.modules.cidr.debugger</depends>
-
   <extensions defaultExtensionNs="com.google.idea.blaze">
     <SyncPlugin implementation="com.google.idea.blaze.cpp.BlazeCSyncPlugin"/>
     <PrefetchFileSource implementation="com.google.idea.blaze.cpp.CPrefetchFileSource"/>

ijwb/src/META-INF/ijwb.xml

diff --git a/ijwb/src/META-INF/ijwb.xml b/ijwb/src/META-INF/ijwb.xml
index b5fcb39..f81f4bf 100644
--- a/ijwb/src/META-INF/ijwb.xml
+++ b/ijwb/src/META-INF/ijwb.xml
@@ -15,6 +15,7 @@
   -->
 <idea-plugin>
   <vendor>Google</vendor>
+  <depends>com.intellij.modules.java</depends>
 
   <extensions defaultExtensionNs="com.intellij">
     <applicationService serviceInterface="com.google.idea.blaze.base.plugin.BlazePluginId"

java/src/META-INF/blaze-java.xml

diff --git a/java/src/META-INF/blaze-java.xml b/java/src/META-INF/blaze-java.xml
index b2ae955..157152f 100644
--- a/java/src/META-INF/blaze-java.xml
+++ b/java/src/META-INF/blaze-java.xml
@@ -14,7 +14,6 @@
   ~ limitations under the License.
   -->
 <idea-plugin>
-  <depends>com.intellij.modules.java</depends>
   <depends>JUnit</depends>
 
   <actions>