diff options
| author | 2015-12-08 08:22:45 -0800 | |
|---|---|---|
| committer | 2015-12-08 08:22:45 -0800 | |
| commit | 0b81f1715d6af9f98f982d6511e48973aa5a836a (patch) | |
| tree | 06924f7e4b7f14db21fe41ec03a6b95eec29efeb /runtime/runtime_options.h | |
| parent | 641c83a8645ef9fd99dca06ec30bae8449b959c7 (diff) | |
| parent | 2433d4e17c3006b8262a0d9421e201fc84777208 (diff) | |
Merge "Allow initializing runtime with parsed options." am: e0d25b156e
am: 2433d4e17c
* commit '2433d4e17c3006b8262a0d9421e201fc84777208':
Allow initializing runtime with parsed options.
Diffstat (limited to 'runtime/runtime_options.h')
| -rw-r--r-- | runtime/runtime_options.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/runtime/runtime_options.h b/runtime/runtime_options.h index 88ac00a672..4610f6f4a1 100644 --- a/runtime/runtime_options.h +++ b/runtime/runtime_options.h @@ -17,14 +17,13 @@ #ifndef ART_RUNTIME_RUNTIME_OPTIONS_H_ #define ART_RUNTIME_RUNTIME_OPTIONS_H_ -#include "runtime/base/variant_map.h" -#include "cmdline/cmdline_types.h" // TODO: don't need to include this file here +#include "base/variant_map.h" +#include "cmdline_types.h" // TODO: don't need to include this file here // Map keys #include <vector> #include <string> -#include "runtime/base/logging.h" -#include "cmdline/unit.h" +#include "base/logging.h" #include "jdwp/jdwp.h" #include "jit/jit.h" #include "jit/jit_code_cache.h" |