commit de6e4cf1b63acd7032a52826d9df21ff649d7128
author Elliott Hughes <enh@google.com> Mon Feb 27 14:46:06 2012 -0800
committer Elliott Hughes <enh@google.com> Mon Feb 27 14:46:06 2012 -0800
tree 00a44b884b33591e3a33512123484145bfee6ff0
parent 408e41920549371079eecd6a6ba2b7ce0fa7e328

Add dex2oat -g to control whether the compiled code has debugger support.

Change-Id: I69c83f707d874fee0464929769b1f1f28e9d97ee

src/dex2oat.cc

diff --git a/src/dex2oat.cc b/src/dex2oat.cc
index a42f946..7f4a132 100644
--- a/src/dex2oat.cc
+++ b/src/dex2oat.cc
@@ -108,12 +108,12 @@
 class Dex2Oat {
  public:
 
-  static Dex2Oat* Create(Runtime::Options& options, size_t thread_count) {
+  static Dex2Oat* Create(Runtime::Options& options, size_t thread_count, bool support_debugging) {
     UniquePtr<Runtime> runtime(CreateRuntime(options));
     if (runtime.get() == NULL) {
       return NULL;
     }
-    return new Dex2Oat(runtime.release(), thread_count);
+    return new Dex2Oat(runtime.release(), thread_count, support_debugging);
   }
 
   ~Dex2Oat() {
@@ -206,7 +206,7 @@
       class_loader.get()->reset(PathClassLoader::AllocCompileTime(class_path_files));
     }
 
-    Compiler compiler(instruction_set_, image, thread_count_, image_classes);
+    Compiler compiler(instruction_set_, image, thread_count_, support_debugging_, image_classes);
     compiler.CompileAll(class_loader->get(), dex_files);
 
     if (!OatWriter::Create(oat_file, class_loader->get(), dex_files, compiler)) {
@@ -247,8 +247,11 @@
 
  private:
 
-  explicit Dex2Oat(Runtime* runtime, size_t thread_count)
-      : runtime_(runtime), thread_count_(thread_count), start_ns_(NanoTime()) {
+  explicit Dex2Oat(Runtime* runtime, size_t thread_count, bool support_debugging)
+      : runtime_(runtime),
+        thread_count_(thread_count),
+        support_debugging_(support_debugging),
+        start_ns_(NanoTime()) {
   }
 
   static Runtime* CreateRuntime(Runtime::Options& options) {
@@ -373,6 +376,7 @@
 
   Runtime* runtime_;
   size_t thread_count_;
+  bool support_debugging_;
   uint64_t start_ns_;
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(Dex2Oat);
@@ -426,6 +430,7 @@
   std::string host_prefix;
   std::vector<const char*> runtime_args;
   int thread_count = 2;
+  bool support_debugging = false;
 
   for (int i = 0; i < argc; i++) {
     const StringPiece option(argv[i]);
@@ -451,6 +456,8 @@
       if (!ParseInt(oat_fd_str, &oat_fd)) {
         Usage("could not parse --oat-fd argument '%s' as an integer", oat_fd_str);
       }
+    } else if (option.starts_with("-g")) {
+      support_debugging = true;
     } else if (option.starts_with("-j")) {
       const char* thread_count_str = option.substr(strlen("-j")).data();
       if (!ParseInt(thread_count_str, &thread_count)) {
@@ -596,7 +603,7 @@
     options.push_back(std::make_pair(runtime_args[i], reinterpret_cast<void*>(NULL)));
   }
 
-  UniquePtr<Dex2Oat> dex2oat(Dex2Oat::Create(options, thread_count));
+  UniquePtr<Dex2Oat> dex2oat(Dex2Oat::Create(options, thread_count, support_debugging));
 
   // If --image-classes was specified, calculate the full list of classes to include in the image
   UniquePtr<const std::set<std::string> > image_classes(NULL);