Merge remote-tracking branch 'upstream/master' into fix-stream-compression-config-interface

1 files changed, 21 insertions, 13 deletions

diff --git a/BUILD b/BUILD
index 8412151ac8..e512ee1156 100644
--- a/BUILD
+++ b/BUILD
@@ -54,11 +54,11 @@ config_setting(
 )
 
 # This should be updated along with build.yaml
-g_stands_for = "glossy"
+g_stands_for = "glamorous"
 
 core_version = "5.0.0-dev"
 
-version = "1.9.0-dev"
+version = "1.10.0-dev"
 
 GPR_PUBLIC_HDRS = [
     "include/grpc/support/alloc.h",
@@ -549,9 +549,9 @@ grpc_cc_library(
     name = "gpr++_base",
     language = "c++",
     public_hdrs = [
-        "src/core/lib/gpr++/abstract.h",
-        "src/core/lib/gpr++/manual_constructor.h",
-        "src/core/lib/gpr++/memory.h",
+        "src/core/lib/gprpp/abstract.h",
+        "src/core/lib/gprpp/manual_constructor.h",
+        "src/core/lib/gprpp/memory.h",
     ],
 )
 
@@ -559,11 +559,11 @@ grpc_cc_library(
     name = "atomic",
     language = "c++",
     public_hdrs = [
-        "src/core/lib/gpr++/atomic.h",
+        "src/core/lib/gprpp/atomic.h",
     ],
     hdrs = [
-        "src/core/lib/gpr++/atomic_with_atm.h",
-        "src/core/lib/gpr++/atomic_with_std.h",
+        "src/core/lib/gprpp/atomic_with_atm.h",
+        "src/core/lib/gprpp/atomic_with_std.h",
     ],
     deps = [
         "gpr",
@@ -574,22 +574,26 @@ grpc_cc_library(
     name = "inlined_vector",
     language = "c++",
     public_hdrs = [
-        "src/core/lib/gpr++/inlined_vector.h",
+        "src/core/lib/gprpp/inlined_vector.h",
+    ],
+    deps = [
+        "gpr++_base",
     ],
 )
 
 grpc_cc_library(
     name = "debug_location",
     language = "c++",
-    public_hdrs = ["src/core/lib/gpr++/debug_location.h"],
+    public_hdrs = ["src/core/lib/gprpp/debug_location.h"],
 )
 
 grpc_cc_library(
     name = "orphanable",
     language = "c++",
-    public_hdrs = ["src/core/lib/gpr++/orphanable.h"],
+    public_hdrs = ["src/core/lib/gprpp/orphanable.h"],
     deps = [
         "debug_location",
+        "gpr++_base",
         "grpc_trace",
     ],
 )
@@ -597,9 +601,10 @@ grpc_cc_library(
 grpc_cc_library(
     name = "ref_counted",
     language = "c++",
-    public_hdrs = ["src/core/lib/gpr++/ref_counted.h"],
+    public_hdrs = ["src/core/lib/gprpp/ref_counted.h"],
     deps = [
         "debug_location",
+        "gpr++_base",
         "grpc_trace",
     ],
 )
@@ -607,7 +612,10 @@ grpc_cc_library(
 grpc_cc_library(
     name = "ref_counted_ptr",
     language = "c++",
-    public_hdrs = ["src/core/lib/gpr++/ref_counted_ptr.h"],
+    public_hdrs = ["src/core/lib/gprpp/ref_counted_ptr.h"],
+    deps = [
+        "gpr++_base",
+    ],
 )
 
 grpc_cc_library(