Snap for 11400057 from 5fe97f9cf39144f67a17edd5fbdcae18d7918dca to simpleperf-releasesimpleperf-release

Change-Id: Ia31ee9ec827c9f19a4ecc177a619a33421d307f9

3 files changed, 30 insertions, 4 deletions

diff --git a/Android.bp b/Android.bp
index 83545c0b21..8e00c4829c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -876,9 +876,33 @@ cc_library {
     apex_available: [
         "//apex_available:platform",
         "com.android.btservices",
-        "com.android.nfcservices",
     ],
     min_sdk_version: "30",
+    visibility: [
+        "//device/google/bertha:__subpackages__",
+        "//device/google/cheets2/camera/v3",
+        "//external/avb",
+        "//external/libbrillo",
+        "//external/libpalmrejection",
+        "//external/puffin",
+        "//external/v4l2_codec2:__subpackages__",
+        "//external/zucchini",
+        "//frameworks/base/services",
+        "//frameworks/base/services/core/jni",
+        "//frameworks/native/libs/vr/libpdx_default_transport",
+        "//frameworks/native/services/inputflinger:__subpackages__",
+        "//hardware/interfaces/keymaster/4.0/vts/performance",
+        "//hardware/interfaces/security/keymint/aidl/vts/performance",
+        "//hardware/nxp/secure_element/snxxx:__subpackages__",
+        "//hardware/nxp/uwb",
+        "//packages/modules/Bluetooth:__subpackages__",
+        "//system/core/fs_mgr/libfs_avb",
+        "//system/core/fs_mgr/libsnapshot",
+        "//system/security/keystore",
+        "//system/update_engine",
+        "//test/sts/tests/hostside/securityPatch:__subpackages__",
+        "//vendor:__subpackages__",
+    ],
 }
 
 // libchrome-crypto shared library for device
diff --git a/base/containers/stack_container.h b/base/containers/stack_container.h
index c775744305..980da077c1 100644
--- a/base/containers/stack_container.h
+++ b/base/containers/stack_container.h
@@ -35,7 +35,7 @@ namespace base {
 template<typename T, size_t stack_capacity>
 class StackAllocator : public std::allocator<T> {
  public:
-  typedef typename std::allocator<T>::pointer pointer;
+  typedef T* pointer;
   typedef typename std::allocator<T>::size_type size_type;
 
   // Backing store for the allocator. The container owner is responsible for
@@ -102,13 +102,13 @@ class StackAllocator : public std::allocator<T> {
   // Actually do the allocation. Use the stack buffer if nobody has used it yet
   // and the size requested fits. Otherwise, fall through to the standard
   // allocator.
-  pointer allocate(size_type n, void* hint = 0) {
+  pointer allocate(size_type n) {
     if (source_ != NULL && !source_->used_stack_buffer_
         && n <= stack_capacity) {
       source_->used_stack_buffer_ = true;
       return source_->stack_buffer();
     } else {
-      return std::allocator<T>::allocate(n, hint);
+      return std::allocator<T>::allocate(n);
     }
   }
 
diff --git a/base/value_iterators.cc b/base/value_iterators.cc
index ba9c73072f..4765f73fdf 100644
--- a/base/value_iterators.cc
+++ b/base/value_iterators.cc
@@ -4,6 +4,8 @@
 
 #include "base/value_iterators.h"
 
+#include "base/values.h"
+
 namespace base {
 
 namespace detail {