commit 023f11dc1bcf86e9e1cc30bcac07735fed790989
author Reed Wanderman-Milne <reedwm@google.com> Fri Nov 01 10:49:05 2019 -0700
committer TensorFlower Gardener <gardener@tensorflow.org> Fri Nov 01 10:53:22 2019 -0700
tree b04629125aa024f0efbc5e96ba45fb8e90641316
parent bf9c196f37b9cbb3109b2891aaf9da85bf5f712a

Attempt to fix Android build failure

PiperOrigin-RevId: 277958330
Change-Id: I2b67358a30042b21a286dbe78f7bfa540d6bef97

tensorflow/core/framework/run_handler.cc

diff --git a/tensorflow/core/framework/run_handler.cc b/tensorflow/core/framework/run_handler.cc
index 457e82f..2fcbf38 100644
--- a/tensorflow/core/framework/run_handler.cc
+++ b/tensorflow/core/framework/run_handler.cc
@@ -19,6 +19,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <memory>
 
 #include "third_party/eigen3/unsupported/Eigen/CXX11/Tensor"
 #include "tensorflow/core/framework/run_handler_util.h"
@@ -686,8 +687,8 @@
 
       num_active_requests = sorted_active_handlers_.size();
       thread_work_sources =
-          std::make_unique<Eigen::MaxSizeVector<ThreadWorkSource*>>(
-              num_active_requests);
+          std::unique_ptr<Eigen::MaxSizeVector<ThreadWorkSource*>>(
+              new Eigen::MaxSizeVector<ThreadWorkSource*>(num_active_requests));
       thread_work_sources->resize(num_active_requests);
       for (int i = 0; i < num_active_requests; ++i) {
         (*thread_work_sources)[i] = sorted_active_handlers_[i]->tws();
@@ -731,8 +732,8 @@
 
       num_active_requests = sorted_active_handlers_.size();
       thread_work_sources =
-          std::make_unique<Eigen::MaxSizeVector<ThreadWorkSource*>>(
-              num_active_requests);
+          std::unique_ptr<Eigen::MaxSizeVector<ThreadWorkSource*>>(
+              new Eigen::MaxSizeVector<ThreadWorkSource*>(num_active_requests));
       thread_work_sources->resize(num_active_requests);
       for (int i = 0; i < num_active_requests; ++i) {
         (*thread_work_sources)[i] = sorted_active_handlers_[i]->tws();