10 files changed, 14 insertions, 14 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
index ff3af5dc16..da4ec05b07 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCommon.java
@@ -149,20 +149,6 @@ public final class CcCommon {
 
   public ImmutableList<String> getCopts() {
     Preconditions.checkState(hasAttribute("copts", Type.STRING_LIST));
-    // TODO(bazel-team): getAttributeCopts should not tokenize the strings. Make a warning for now.
-    List<String> tokens = new ArrayList<>();
-    for (String str : ruleContext.attributes().get("copts", Type.STRING_LIST)) {
-      tokens.clear();
-      try {
-        ShellUtils.tokenize(tokens, str);
-        if (tokens.size() > 1) {
-          ruleContext.attributeWarning("copts",
-              "each item in the list should contain only one option");
-        }
-      } catch (ShellUtils.TokenizationException e) {
-        // ignore, the error is reported in the getAttributeCopts call
-      }
-    }
 
     if (!getCoptsFilter(ruleContext).apply("-Wno-future-warnings")) {
       ruleContext.attributeWarning(
diff --git a/src/main/protobuf/android_deploy_info.proto b/src/main/protobuf/android_deploy_info.proto
index 30c7328a0f..bdff79afbd 100644
--- a/src/main/protobuf/android_deploy_info.proto
+++ b/src/main/protobuf/android_deploy_info.proto
@@ -15,6 +15,7 @@
 syntax = "proto3";
 package blaze;
 
+// option java_api_version = 2;
 option java_package = "com.google.devtools.build.lib.rules.android.deployinfo";
 
 message Artifact {
diff --git a/src/main/protobuf/apk_manifest.proto b/src/main/protobuf/apk_manifest.proto
index 2f8b25b41d..6b8afb1047 100644
--- a/src/main/protobuf/apk_manifest.proto
+++ b/src/main/protobuf/apk_manifest.proto
@@ -15,6 +15,7 @@
 syntax = "proto3";
 package blaze.apk_manifest;
 
+// option java_api_version = 2;
 option java_package = "com.google.devtools.build.lib.rules.android.apkmanifest";
 
 message Artifact {
diff --git a/src/main/protobuf/bazel_flags.proto b/src/main/protobuf/bazel_flags.proto
index f070d54628..f3a8a9f2d5 100644
--- a/src/main/protobuf/bazel_flags.proto
+++ b/src/main/protobuf/bazel_flags.proto
@@ -18,6 +18,7 @@ syntax = "proto2";
 
 option java_outer_classname = "BazelFlagsProto";
 option java_package = "com.google.devtools.build.lib.runtime.commands.proto";
+// option java_api_version = 2;
 
 package bazel_flags;
 
diff --git a/src/main/protobuf/build.proto b/src/main/protobuf/build.proto
index e8ed696db0..57a0784b3e 100644
--- a/src/main/protobuf/build.proto
+++ b/src/main/protobuf/build.proto
@@ -19,6 +19,9 @@ syntax = "proto2";
 
 package blaze_query;
 
+// option cc_api_version = 2;
+// option java_api_version = 1;
+// option py_api_version = 1;
 
 option java_package = "com.google.devtools.build.lib.query2.proto.proto2api";
 
diff --git a/src/main/protobuf/command_line.proto b/src/main/protobuf/command_line.proto
index dd04ffb674..e1ced1fb3f 100644
--- a/src/main/protobuf/command_line.proto
+++ b/src/main/protobuf/command_line.proto
@@ -15,6 +15,7 @@
 syntax = "proto3";
 package command_line;
 
+// option java_api_version = 2;
 option java_package = "com.google.devtools.build.lib.runtime.proto";
 
 import "src/main/protobuf/option_filters.proto";
diff --git a/src/main/protobuf/crosstool_config.proto b/src/main/protobuf/crosstool_config.proto
index d89dc3b681..69b4a50c22 100644
--- a/src/main/protobuf/crosstool_config.proto
+++ b/src/main/protobuf/crosstool_config.proto
@@ -16,8 +16,10 @@
 
 syntax = "proto2";
 
+// option java_api_version = 2;
 option java_package = "com.google.devtools.build.lib.view.config.crosstool";
 
+// option py_api_version = 2;
 
 package com.google.devtools.build.lib.view.config.crosstool;
 
diff --git a/src/main/protobuf/extra_actions_base.proto b/src/main/protobuf/extra_actions_base.proto
index 759e0c37d3..d2528c0d83 100644
--- a/src/main/protobuf/extra_actions_base.proto
+++ b/src/main/protobuf/extra_actions_base.proto
@@ -20,6 +20,9 @@ package blaze;
 
 option java_multiple_files = true;
 option java_package = "com.google.devtools.build.lib.actions.extra";
+// option cc_api_version = 2;
+// option py_api_version = 2;
+// option java_api_version = 2;
 
 // A list of extra actions and metadata for the print_action command.
 message ExtraActionSummary {
diff --git a/src/main/protobuf/invocation_policy.proto b/src/main/protobuf/invocation_policy.proto
index 92a0da3549..53572ac120 100644
--- a/src/main/protobuf/invocation_policy.proto
+++ b/src/main/protobuf/invocation_policy.proto
@@ -15,6 +15,7 @@
 syntax = "proto2";
 package blaze.invocation_policy;
 
+// option java_api_version = 2;
 option java_package = "com.google.devtools.build.lib.runtime.proto";
 
 // The --invocation_policy flag takes a base64-encoded binary-serialized or text
diff --git a/src/main/protobuf/option_filters.proto b/src/main/protobuf/option_filters.proto
index 92342e51b0..4179f1914d 100644
--- a/src/main/protobuf/option_filters.proto
+++ b/src/main/protobuf/option_filters.proto
@@ -14,6 +14,7 @@
 syntax = "proto3";
 package options;
 
+// option java_api_version = 2;
 option java_package = "com.google.devtools.common.options.proto";
 
 // IMPORTANT NOTE: These two enums must be kept in sync with their Java