From: Calin Juravle <calin@google.com>
Date: Mon, 21 Dec 2015 09:43:09 +0000 (+0000)
Subject: Merge "Pass down to the runtime the application code paths."
X-Git-Tag: android-x86-7.1-r1~859
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=115a02b737dd5f4d485b2f6c359e02988df66b83;p=android-x86%2Fart.git

Merge "Pass down to the runtime the application code paths."
---

115a02b737dd5f4d485b2f6c359e02988df66b83
diff --cc runtime/jit/jit.h
index e80a37634,8a0778cea..7a2db31fc
--- a/runtime/jit/jit.h
+++ b/runtime/jit/jit.h
@@@ -72,12 -72,9 +72,13 @@@ class Jit 
      return instrumentation_cache_.get();
    }
  
+   void SetDexLocationsForProfiling(const std::vector<std::string>& dex_locations);
    void SaveProfilingInfo(const std::string& filename);
  
 +  void DumpForSigQuit(std::ostream& os) {
 +    DumpInfo(os);
 +  }
 +
   private:
    Jit();
    bool LoadCompiler(std::string* error_msg);