Snap for 12917811 from d651644 to sdk-release

Change-Id: Ibeba8ab31dde821d176851b9f242e2f153b8bb2b
msft-mirror-aosp · Jan 15, 2025 · 0057165 · 0057165
2 parents 96b1e56 + d651644
commit 0057165
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/Android.bp b/Android.bp
@@ -659,6 +659,7 @@ cc_defaults {
     host_supported: true,
     vendor_available: true,
     product_available: true,
+    recovery_available: true,
     apex_available: [
         "//apex_available:platform",
     ],
@@ -884,7 +885,7 @@ cc_library_static {
         "//apex_available:anyapex",
         "//apex_available:platform",
     ],
-
+    min_sdk_version: "apex_inherit",
 }
 
 // gRPC C++ library target with no encryption or authentication
@@ -947,7 +948,7 @@ cc_library_shared {
         "//apex_available:anyapex",
         "//apex_available:platform",
     ],
-
+    min_sdk_version: "apex_inherit",
 }
 
 cc_library_static {
@@ -968,7 +969,7 @@ cc_library_static {
         "//apex_available:anyapex",
         "//apex_available:platform",
     ],
-
+    min_sdk_version: "apex_inherit",
 }
 
 cc_library_static {
@@ -995,6 +996,7 @@ cc_defaults {
     header_libs: ["libgrpc++_internal_headers"],
     static_libs: ["libgpr_test_util"],
     shared_libs: ["libgrpc++_unsecure"],
+    recovery_available: false,
 }
 
 cc_test {

diff --git a/src/core/lib/promise/detail/basic_seq.h b/src/core/lib/promise/detail/basic_seq.h
@@ -99,8 +99,7 @@ class BasicSeqIter {
           }
           cur_ = next;
           state_.~State();
-          Construct(&state_,
-                    Traits::template CallSeqFactory(f_, *cur_, std::move(arg)));
+          Construct(&state_, Traits::CallSeqFactory(f_, *cur_, std::move(arg)));
           return PollNonEmpty();
         });
   }

diff --git a/third_party/upb/Android.bp b/third_party/upb/Android.bp
@@ -23,7 +23,7 @@ cc_library_headers {
         "//apex_available:anyapex",
         "//apex_available:platform",
     ],
-
+    min_sdk_version: "apex_inherit",
 }
 
 cc_library_static {

diff --git a/third_party/utf8_range/Android.bp b/third_party/utf8_range/Android.bp
@@ -29,5 +29,5 @@ cc_library_static {
         "//apex_available:anyapex",
         "//apex_available:platform",
     ],
-
+    min_sdk_version: "apex_inherit",
 }
diff --git a/third_party/xxhash/Android.bp b/third_party/xxhash/Android.bp
@@ -21,5 +21,5 @@ cc_library_headers {
         "//apex_available:anyapex",
         "//apex_available:platform",
     ],
-
+    min_sdk_version: "apex_inherit",
 }