commit ebeda85eb80ccf9ae96d532b35fcae0364447fb1
author Stanley Cheung <stanleycheung@google.com> Wed May 17 19:34:47 2017 -0700
committer Stanley Cheung <stanleycheung@google.com> Wed May 17 19:34:47 2017 -0700
tree da771a0736c70508be835e461f74be6a245c032a
parent de9a10798b4de4bfd5b17354b834d4b3674e8e1a
parent 0bb3986ffa3bbb6fa1db2ca8ec5bac3ee240bc7a

Upmerge from v1.3.x branch to master

BUILD

diff --git a/BUILD b/BUILD
index 3e54e87..cc5fd3e 100644
--- a/BUILD
+++ b/BUILD
@@ -745,7 +745,7 @@
         "grpc_transport_chttp2_server_insecure",
         "grpc_workaround_cronet_compression_filter",
         "grpc_server_backward_compatibility",
-    ]
+    ],
 )
 
 grpc_cc_library(
@@ -1400,22 +1400,22 @@
 
 grpc_cc_library(
     name = "grpc++_base",
-    hdrs = GRPCXX_HDRS,
     srcs = GRPCXX_SRCS,
-    public_hdrs = GRPCXX_PUBLIC_HDRS,
+    hdrs = GRPCXX_HDRS,
     language = "c++",
+    public_hdrs = GRPCXX_PUBLIC_HDRS,
     deps = [
-        "grpc++_codegen_base",
         "grpc",
+        "grpc++_codegen_base",
     ],
 )
 
 grpc_cc_library(
     name = "grpc++_base_unsecure",
-    hdrs = GRPCXX_HDRS,
     srcs = GRPCXX_SRCS,
-    public_hdrs = GRPCXX_PUBLIC_HDRS,
+    hdrs = GRPCXX_HDRS,
     language = "c++",
+    public_hdrs = GRPCXX_PUBLIC_HDRS,
     deps = [
         "grpc++_codegen_base",
         "grpc_unsecure",
@@ -1539,5 +1539,4 @@
     ],
 )
 
-
 grpc_generate_one_off_targets()