summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--compiler/Android.bp30
1 files changed, 26 insertions, 4 deletions
diff --git a/compiler/Android.bp b/compiler/Android.bp
index 90ff919dbb..289adf87b7 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -212,17 +212,28 @@ art_cc_library {
name: "libart-compiler",
defaults: ["libart-compiler-defaults"],
codegen: {
+ arm: {
+ // VIXL assembly support for ARM targets.
+ static: {
+ whole_static_libs: [
+ "libvixl-arm",
+ ],
+ },
+ shared: {
+ shared_libs: [
+ "libvixl-arm",
+ ],
+ },
+ },
arm64: {
// VIXL assembly support for ARM64 targets.
static: {
whole_static_libs: [
- "libvixl-arm",
"libvixl-arm64",
],
},
shared: {
shared_libs: [
- "libvixl-arm",
"libvixl-arm64",
],
},
@@ -238,17 +249,28 @@ art_cc_library {
"art_debug_defaults",
],
codegen: {
+ arm: {
+ // VIXL assembly support for ARM targets.
+ static: {
+ whole_static_libs: [
+ "libvixld-arm",
+ ],
+ },
+ shared: {
+ shared_libs: [
+ "libvixld-arm",
+ ],
+ },
+ },
arm64: {
// VIXL assembly support for ARM64 targets.
static: {
whole_static_libs: [
- "libvixld-arm",
"libvixld-arm64",
],
},
shared: {
shared_libs: [
- "libvixld-arm",
"libvixld-arm64",
],
},