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:
7d26164
)
Fix mac build
author
Colin Cross
<ccross@android.com>
Thu, 15 Sep 2016 23:24:51 +0000
(16:24 -0700)
committer
Colin Cross
<ccross@android.com>
Thu, 15 Sep 2016 23:24:51 +0000
(16:24 -0700)
I accidentally dropped the hunks that disabled the mac build when
rebasing.
Change-Id: I412325f71c4bfde7a357b50daeb966e6db32c388
test/Android.bp
patch
|
blob
|
history
diff --git
a/test/Android.bp
b/test/Android.bp
index
46d7c94
..
88bc34e
100644
(file)
--- a/
test/Android.bp
+++ b/
test/Android.bp
@@
-69,6
+69,9
@@
art_cc_defaults {
"-Wno-missing-noreturn",
],
},
+ darwin: {
+ enabled: false,
+ },
android: {
ldflags: [
// Allow jni_compiler_test to find Java_MyClassNatives_bar
@@
-148,6
+151,9
@@
art_cc_defaults {
"-Wno-missing-noreturn",
],
},
+ darwin: {
+ enabled: false,
+ },
},
}
@@
-175,5
+181,8
@@
art_cc_library {
"-lpthread",
],
},
+ darwin: {
+ enabled: false,
+ },
},
}