Fix arm32 build
libvixl-arm is required for arm codegen targets.
Change-Id: I6e8dab7c406bebbb8dfd9bebdb8dbb7ce21c79b3
diff --git a/compiler/Android.bp b/compiler/Android.bp
index 90ff919..289adf8 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -212,17 +212,28 @@
name: "libart-compiler",
defaults: ["libart-compiler-defaults"],
codegen: {
- arm64: {
- // VIXL assembly support for ARM64 targets.
+ arm: {
+ // VIXL assembly support for ARM targets.
static: {
whole_static_libs: [
"libvixl-arm",
- "libvixl-arm64",
],
},
shared: {
shared_libs: [
"libvixl-arm",
+ ],
+ },
+ },
+ arm64: {
+ // VIXL assembly support for ARM64 targets.
+ static: {
+ whole_static_libs: [
+ "libvixl-arm64",
+ ],
+ },
+ shared: {
+ shared_libs: [
"libvixl-arm64",
],
},
@@ -238,17 +249,28 @@
"art_debug_defaults",
],
codegen: {
- arm64: {
- // VIXL assembly support for ARM64 targets.
+ arm: {
+ // VIXL assembly support for ARM targets.
static: {
whole_static_libs: [
"libvixld-arm",
- "libvixld-arm64",
],
},
shared: {
shared_libs: [
"libvixld-arm",
+ ],
+ },
+ },
+ arm64: {
+ // VIXL assembly support for ARM64 targets.
+ static: {
+ whole_static_libs: [
+ "libvixld-arm64",
+ ],
+ },
+ shared: {
+ shared_libs: [
"libvixld-arm64",
],
},
