commit 9186ced255f2e7402646b5b286deebb540640734
author Andreas Gampe <agampe@google.com> Mon Dec 12 14:28:21 2016 -0800
committer Andreas Gampe <agampe@google.com> Tue Dec 13 11:43:48 2016 -0800
tree 833c25fd3bbb47749265947705b4fc0f0c1ba796
parent aa2657d6d9dda2e44c6452e5f5901db78ef9b3cc

ART: Clean up utils.h

Remove functionality provided by libbase. Move some single-use
functions to their respective users.

Test: m test-art-host
Change-Id: I75594035fa975200d638cc29bb9f31bc6e6cb29f

runtime/arch/instruction_set_features.cc

diff --git a/runtime/arch/instruction_set_features.cc b/runtime/arch/instruction_set_features.cc
index b32391f..db004e7 100644
--- a/runtime/arch/instruction_set_features.cc
+++ b/runtime/arch/instruction_set_features.cc
@@ -16,6 +16,8 @@
 
 #include "instruction_set_features.h"
 
+#include "android-base/strings.h"
+
 #include "base/casts.h"
 #include "utils.h"
 
@@ -224,7 +226,7 @@
       *error_msg = "Unexpected instruction set features after 'default'";
       return std::unique_ptr<const InstructionSetFeatures>();
     }
-    std::string feature = Trim(*it);
+    std::string feature = android::base::Trim(*it);
     bool erase = false;
     if (feature == "default") {
       if (!first) {