Snap for 10071751 from 59152d606940a8cd82152841e858e739a6f79b9c to udc-qpr1-releaseandroid-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-release

Change-Id: Ic4d0e69b3b1fe805b4834d1b8cd853c2610b9207

3 files changed, 15 insertions, 6 deletions

diff --git a/Android.bp b/Android.bp
index 5ca74c4599..3eb4aa51ec 100644
--- a/Android.bp
+++ b/Android.bp
@@ -236,7 +236,6 @@ cc_library_host_static {
         "test/cpp/util/test_config_cc.cc",
     ],
     local_include_dirs: [
-        "test/cpp/util",
         "include"
     ],
     static_libs: [
@@ -258,9 +257,8 @@ cc_library_host_static {
     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_static {
     ],
 }
 
+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 @@ cc_library_shared {
     ],
     export_include_dirs: [
         "include",
-        ".",
     ],
 }
 
@@ -1289,6 +1293,5 @@ cc_library_shared {
     ],
     export_include_dirs: [
         "include",
-        ".",
     ],
 }
diff --git a/test/core/util/Android.bp b/test/core/util/Android.bp
index fff362d588..105a8e42c6 100644
--- a/test/core/util/Android.bp
+++ b/test/core/util/Android.bp
@@ -14,6 +14,9 @@ cc_library_static {
         "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 2f6eb43178..3c60a851ef 100644
--- a/test/cpp/common/Android.bp
+++ b/test/cpp/common/Android.bp
@@ -14,6 +14,9 @@ cc_test {
     srcs: [
         "alarm_test.cc",
     ],
+    header_libs: [
+        "libgrpc++_internal_headers",
+    ],
     static_libs: [
         "libgpr_test_util",
     ],