diff options
| author | Colin Cross <ccross@android.com> | 2015-03-18 14:01:19 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@google.com> | 2015-03-18 21:05:14 +0000 |
| commit | e84e4f77388ec9c1d63fb4b21605eedca2a2e932 (patch) | |
| tree | 0e6aca3eeeeb60c504ab998bad57a287544ff7df /runtime/interpreter/interpreter_goto_table_impl.cc | |
| parent | 94e480778b0946d1ab405ecf901e5d41ed54cc17 (diff) | |
| download | android_art-e84e4f77388ec9c1d63fb4b21605eedca2a2e932.tar.gz android_art-e84e4f77388ec9c1d63fb4b21605eedca2a2e932.tar.bz2 android_art-e84e4f77388ec9c1d63fb4b21605eedca2a2e932.zip | |
Remove the Android.mk GCC-only source files hackery
The complexity in Android.mk to deal with GCC-only source files is
unnecessary, use #if !defined(__clang__) around the contents of
interpreter/interpreter_goto_table_impl.cc, the same way
interpreter/interpreter.cc does around references to it.
Bug: 17716550
Change-Id: I775c23b6790d38b0d73a92529c696a31e6a4ae83
Diffstat (limited to 'runtime/interpreter/interpreter_goto_table_impl.cc')
| -rw-r--r-- | runtime/interpreter/interpreter_goto_table_impl.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/runtime/interpreter/interpreter_goto_table_impl.cc b/runtime/interpreter/interpreter_goto_table_impl.cc index 5f97f941fb..af0a530688 100644 --- a/runtime/interpreter/interpreter_goto_table_impl.cc +++ b/runtime/interpreter/interpreter_goto_table_impl.cc @@ -14,6 +14,9 @@ * limitations under the License. */ +#if !defined(__clang__) +// Clang 3.4 fails to build the goto interpreter implementation. + #include "interpreter_common.h" #include "safe_math.h" @@ -2477,3 +2480,5 @@ JValue ExecuteGotoImpl<false, true>(Thread* self, const DexFile::CodeItem* code_ } // namespace interpreter } // namespace art + +#endif |