From 58c136ca0f9154a1a4f319f82734c4742f4632fa Mon Sep 17 00:00:00 2001
From: Menghan Li <menghanl@google.com>
Date: Thu, 30 May 2019 13:08:45 -0700
Subject: [PATCH] [xds_112] internal: balancer/xds remove build contrain >=
 1.12 (#2834)

This reverts commit b03f6fd5e3dfa7663a225c36a15d623159f6724b.
---
 balancer/xds/edsbalancer/balancergroup.go      | 2 --
 balancer/xds/edsbalancer/balancergroup_test.go | 2 --
 balancer/xds/edsbalancer/edsbalancer.go        | 2 --
 balancer/xds/edsbalancer/edsbalancer_test.go   | 2 --
 balancer/xds/edsbalancer/test_util_test.go     | 2 --
 balancer/xds/edsbalancer/util.go               | 2 --
 balancer/xds/edsbalancer/util_test.go          | 2 --
 balancer/xds/xds.go                            | 2 --
 balancer/xds/xds_client.go                     | 2 --
 balancer/xds/xds_client_test.go                | 2 --
 balancer/xds/xds_lrs_test.go                   | 2 --
 balancer/xds/xds_test.go                       | 2 --
 12 files changed, 24 deletions(-)

diff --git a/balancer/xds/edsbalancer/balancergroup.go b/balancer/xds/edsbalancer/balancergroup.go
index 822e7c61..a921fab6 100644
--- a/balancer/xds/edsbalancer/balancergroup.go
+++ b/balancer/xds/edsbalancer/balancergroup.go
@@ -1,5 +1,3 @@
-// +build go1.12
-
 /*
  * Copyright 2019 gRPC authors.
  *
diff --git a/balancer/xds/edsbalancer/balancergroup_test.go b/balancer/xds/edsbalancer/balancergroup_test.go
index 10ed684e..580d9069 100644
--- a/balancer/xds/edsbalancer/balancergroup_test.go
+++ b/balancer/xds/edsbalancer/balancergroup_test.go
@@ -1,5 +1,3 @@
-// +build go1.12
-
 /*
  * Copyright 2019 gRPC authors.
  *
diff --git a/balancer/xds/edsbalancer/edsbalancer.go b/balancer/xds/edsbalancer/edsbalancer.go
index 80b2f027..3867b469 100644
--- a/balancer/xds/edsbalancer/edsbalancer.go
+++ b/balancer/xds/edsbalancer/edsbalancer.go
@@ -1,5 +1,3 @@
-// +build go1.12
-
 /*
  * Copyright 2019 gRPC authors.
  *
diff --git a/balancer/xds/edsbalancer/edsbalancer_test.go b/balancer/xds/edsbalancer/edsbalancer_test.go
index 5bdddd1e..7d907483 100644
--- a/balancer/xds/edsbalancer/edsbalancer_test.go
+++ b/balancer/xds/edsbalancer/edsbalancer_test.go
@@ -1,5 +1,3 @@
-// +build go1.12
-
 /*
  * Copyright 2019 gRPC authors.
  *
diff --git a/balancer/xds/edsbalancer/test_util_test.go b/balancer/xds/edsbalancer/test_util_test.go
index 674a2b46..ed0415d4 100644
--- a/balancer/xds/edsbalancer/test_util_test.go
+++ b/balancer/xds/edsbalancer/test_util_test.go
@@ -1,5 +1,3 @@
-// +build go1.12
-
 /*
  * Copyright 2019 gRPC authors.
  *
diff --git a/balancer/xds/edsbalancer/util.go b/balancer/xds/edsbalancer/util.go
index a271cf5a..5b7ba4b1 100644
--- a/balancer/xds/edsbalancer/util.go
+++ b/balancer/xds/edsbalancer/util.go
@@ -1,5 +1,3 @@
-// +build go1.12
-
 /*
  * Copyright 2019 gRPC authors.
  *
diff --git a/balancer/xds/edsbalancer/util_test.go b/balancer/xds/edsbalancer/util_test.go
index f20825ea..fe4da770 100644
--- a/balancer/xds/edsbalancer/util_test.go
+++ b/balancer/xds/edsbalancer/util_test.go
@@ -1,5 +1,3 @@
-// +build go1.12
-
 /*
  * Copyright 2019 gRPC authors.
  *
diff --git a/balancer/xds/xds.go b/balancer/xds/xds.go
index d6fa9d37..88e3e027 100644
--- a/balancer/xds/xds.go
+++ b/balancer/xds/xds.go
@@ -1,5 +1,3 @@
-// +build go1.12
-
 /*
  *
  * Copyright 2019 gRPC authors.
diff --git a/balancer/xds/xds_client.go b/balancer/xds/xds_client.go
index ef779ff8..02919644 100644
--- a/balancer/xds/xds_client.go
+++ b/balancer/xds/xds_client.go
@@ -1,5 +1,3 @@
-// +build go1.12
-
 /*
  *
  * Copyright 2019 gRPC authors.
diff --git a/balancer/xds/xds_client_test.go b/balancer/xds/xds_client_test.go
index 2e3ce9df..d144c6e3 100644
--- a/balancer/xds/xds_client_test.go
+++ b/balancer/xds/xds_client_test.go
@@ -1,5 +1,3 @@
-// +build go1.12
-
 /*
  *
  * Copyright 2019 gRPC authors.
diff --git a/balancer/xds/xds_lrs_test.go b/balancer/xds/xds_lrs_test.go
index b7f31200..7dc3f164 100644
--- a/balancer/xds/xds_lrs_test.go
+++ b/balancer/xds/xds_lrs_test.go
@@ -1,5 +1,3 @@
-// +build go1.12
-
 /*
  *
  * Copyright 2019 gRPC authors.
diff --git a/balancer/xds/xds_test.go b/balancer/xds/xds_test.go
index b705271c..4b08f05e 100644
--- a/balancer/xds/xds_test.go
+++ b/balancer/xds/xds_test.go
@@ -1,5 +1,3 @@
-// +build go1.12
-
 /*
  *
  * Copyright 2019 gRPC authors.