OSDN Git Service
(root)
/
android-x86
/
art.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c7ed09b
)
ART: Fix Mac build
author
Andreas Gampe
<agampe@google.com>
Fri, 29 Apr 2016 22:04:49 +0000
(15:04 -0700)
committer
Andreas Gampe
<agampe@google.com>
Fri, 29 Apr 2016 23:06:38 +0000
(16:06 -0700)
Fix Mac build after
fc6898769ae1ef91ec3e41c0a273401213cb82cd
.
Bug:
28423466
(cherry picked from commit
4cf9adc1ed1bcbfe45c9caf944130aae7e39a4cd
)
Change-Id: I6942bc86f1b0819d84bced5499afb0a4d235a39e
runtime/arch/x86_64/entrypoints_init_x86_64.cc
patch
|
blob
|
history
diff --git
a/runtime/arch/x86_64/entrypoints_init_x86_64.cc
b/runtime/arch/x86_64/entrypoints_init_x86_64.cc
index
2f7f5aa
..
bd6df70
100644
(file)
--- a/
runtime/arch/x86_64/entrypoints_init_x86_64.cc
+++ b/
runtime/arch/x86_64/entrypoints_init_x86_64.cc
@@
-17,7
+17,9
@@
#include "entrypoints/jni/jni_entrypoints.h"
#include "entrypoints/quick/quick_alloc_entrypoints.h"
#include "entrypoints/quick/quick_default_externs.h"
+#if !defined(__APPLE__)
#include "entrypoints/quick/quick_default_init_entrypoints.h"
+#endif
#include "entrypoints/quick/quick_entrypoints.h"
#include "entrypoints/math_entrypoints.h"
#include "entrypoints/runtime_asm_entrypoints.h"