Add gRPC internal headers module. am: 4a7a77cacb
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/grpc-grpc/+/22982889
Change-Id: I9b60abfd986727f8281058a04ecb7203a2c1bac6
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/Android.bp b/Android.bp
index 5ca74c4..3eb4aa5 100644
--- a/Android.bp
+++ b/Android.bp
@@ -236,7 +236,6 @@
"test/cpp/util/test_config_cc.cc",
],
local_include_dirs: [
- "test/cpp/util",
"include"
],
static_libs: [
@@ -258,9 +257,8 @@
cflags: [
"-Wno-unused-parameter",
],
- export_include_dirs: [
- "test/cpp/util",
- ]
+ export_include_dirs: ["."],
+ visibility: ["//device/google/cuttlefish:__subpackages__"],
}
cc_library_static {
@@ -1238,6 +1236,13 @@
],
}
+cc_library_headers {
+ name: "libgrpc++_internal_headers",
+ defaults: ["grpc_defaults"],
+ export_include_dirs: ["."],
+ visibility: ["//visibility:public"],
+}
+
// gRPC C++ library target with no encryption or authentication
cc_library_shared {
name: "libgrpc++_unsecure",
@@ -1258,7 +1263,6 @@
],
export_include_dirs: [
"include",
- ".",
],
}
@@ -1289,6 +1293,5 @@
],
export_include_dirs: [
"include",
- ".",
],
}
diff --git a/test/core/util/Android.bp b/test/core/util/Android.bp
index fff362d..105a8e4 100644
--- a/test/core/util/Android.bp
+++ b/test/core/util/Android.bp
@@ -14,6 +14,9 @@
"memory_counters.cc",
"test_config.cc",
],
+ header_libs: [
+ "libgrpc++_internal_headers",
+ ],
static_libs: [
"gpr_base",
],
diff --git a/test/cpp/common/Android.bp b/test/cpp/common/Android.bp
index 2f6eb43..3c60a85 100644
--- a/test/cpp/common/Android.bp
+++ b/test/cpp/common/Android.bp
@@ -14,6 +14,9 @@
srcs: [
"alarm_test.cc",
],
+ header_libs: [
+ "libgrpc++_internal_headers",
+ ],
static_libs: [
"libgpr_test_util",
],
