diff options
author | Dragos Sbirlea <dragoss@google.com> | 2013-08-13 18:07:04 -0700 |
---|---|---|
committer | Dragos Sbirlea <dragoss@google.com> | 2013-08-15 15:10:55 -0700 |
commit | bd136a29f08486525d6abc7d0a0006ce5b4011c1 (patch) | |
tree | 71a61d4545e7fa871d2cafee23dd5e3beb6619ee /runtime/entrypoints/entrypoint_utils.h | |
parent | 7d70a7932f0ba09eb01a93caab060aef1403d4e6 (diff) | |
download | art-bd136a29f08486525d6abc7d0a0006ce5b4011c1.zip art-bd136a29f08486525d6abc7d0a0006ce5b4011c1.tar.gz art-bd136a29f08486525d6abc7d0a0006ce5b4011c1.tar.bz2 |
Get PORTABLE + SMALL on x86.
Implemented the portable resolution trampoline and
the portable to interpreter bridge.
Also work on integrating SEA_IR in the PORTABLE+SMALL framework.
Refactor some naming and correct indenting.
Change-Id: Ibd97da5e5b6f5148274c9bff368e3654b661ef51
Diffstat (limited to 'runtime/entrypoints/entrypoint_utils.h')
-rw-r--r-- | runtime/entrypoints/entrypoint_utils.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/entrypoints/entrypoint_utils.h b/runtime/entrypoints/entrypoint_utils.h index 2b73af4..8b58cb3 100644 --- a/runtime/entrypoints/entrypoint_utils.h +++ b/runtime/entrypoints/entrypoint_utils.h @@ -16,7 +16,7 @@ #ifndef ART_RUNTIME_ENTRYPOINTS_ENTRYPOINT_UTILS_H_ #define ART_RUNTIME_ENTRYPOINTS_ENTRYPOINT_UTILS_H_ - +#include "object_utils.h" #include "class_linker.h" #include "common_throws.h" #include "dex_file.h" @@ -27,7 +27,7 @@ #include "mirror/array.h" #include "mirror/class-inl.h" #include "mirror/throwable.h" -#include "object_utils.h" + #include "thread.h" namespace art { |