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

diff --cc runtime/jit/jit.cc
Simple merge

diff --cc runtime/jit/jit.h
index e80a376,8a0778c..7a2db31
--- 1/runtime/jit/jit.h
--- 2/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);

diff --cc runtime/jit/jit_code_cache.h
Simple merge

diff --cc runtime/runtime.cc
Simple merge