diff options
| -rw-r--r-- | build/codegen.go | 5 | ||||
| -rw-r--r-- | compiler/Android.bp | 22 | ||||
| -rw-r--r-- | disassembler/Android.bp | 6 | ||||
| -rw-r--r-- | oatdump/Android.bp | 6 | ||||
| -rw-r--r-- | runtime/Android.bp | 3 | ||||
| -rw-r--r-- | simulator/Android.bp | 4 | ||||
| -rw-r--r-- | test/Android.bp | 3 |
7 files changed, 21 insertions, 28 deletions
diff --git a/build/codegen.go b/build/codegen.go index 8526bf192b..d0db78e571 100644 --- a/build/codegen.go +++ b/build/codegen.go @@ -107,8 +107,9 @@ func codegen(ctx android.LoadHookContext, c *codegenProperties, library bool) { } type CodegenCommonArchProperties struct { - Srcs []string - Cflags []string + Srcs []string + Cflags []string + Cppflags []string } type CodegenLibraryArchProperties struct { diff --git a/compiler/Android.bp b/compiler/Android.bp index c2f8e3c66e..0275bb2c80 100644 --- a/compiler/Android.bp +++ b/compiler/Android.bp @@ -230,12 +230,12 @@ art_cc_library { // VIXL assembly support for ARM targets. static: { whole_static_libs: [ - "libvixl-arm", + "libvixl", ], }, shared: { shared_libs: [ - "libvixl-arm", + "libvixl", ], }, }, @@ -243,12 +243,12 @@ art_cc_library { // VIXL assembly support for ARM64 targets. static: { whole_static_libs: [ - "libvixl-arm64", + "libvixl", ], }, shared: { shared_libs: [ - "libvixl-arm64", + "libvixl", ], }, }, @@ -292,12 +292,12 @@ art_cc_library { // VIXL assembly support for ARM targets. static: { whole_static_libs: [ - "libvixld-arm", + "libvixld", ], }, shared: { shared_libs: [ - "libvixld-arm", + "libvixld", ], }, }, @@ -305,12 +305,12 @@ art_cc_library { // VIXL assembly support for ARM64 targets. static: { whole_static_libs: [ - "libvixld-arm64", + "libvixld", ], }, shared: { shared_libs: [ - "libvixld-arm64", + "libvixld", ], }, }, @@ -451,8 +451,7 @@ art_cc_test { "libprofiled", "libartd-compiler", "libartd-simulator-container", - "libvixld-arm", - "libvixld-arm64", + "libvixld", "libbacktrace", "libnativeloader", @@ -509,7 +508,6 @@ art_cc_test { }, shared_libs: [ "libartd-compiler", - "libvixld-arm", - "libvixld-arm64", + "libvixld", ], } diff --git a/disassembler/Android.bp b/disassembler/Android.bp index a7c1802515..5aa159e98b 100644 --- a/disassembler/Android.bp +++ b/disassembler/Android.bp @@ -69,8 +69,7 @@ art_cc_library { defaults: ["libart-disassembler-defaults"], shared_libs: [ // For disassembler_arm*. - "libvixl-arm", - "libvixl-arm64", + "libvixl", ], } @@ -82,7 +81,6 @@ art_cc_library { ], shared_libs: [ // For disassembler_arm*. - "libvixld-arm", - "libvixld-arm64", + "libvixld", ], } diff --git a/oatdump/Android.bp b/oatdump/Android.bp index 596a94664d..45f853b06e 100644 --- a/oatdump/Android.bp +++ b/oatdump/Android.bp @@ -100,8 +100,7 @@ art_cc_binary { ], static_libs: [ "libart-disassembler", - "libvixl-arm", - "libvixl-arm64", + "libvixl", ], } @@ -124,8 +123,7 @@ art_cc_binary { }, static_libs: [ "libartd-disassembler", - "libvixld-arm", - "libvixld-arm64", + "libvixld", ], group_static_libs: true, } diff --git a/runtime/Android.bp b/runtime/Android.bp index 86ee952022..7c4792e63a 100644 --- a/runtime/Android.bp +++ b/runtime/Android.bp @@ -661,8 +661,7 @@ art_cc_test { ], shared_libs: [ "libartd-compiler", - "libvixld-arm", - "libvixld-arm64", + "libvixld", ], } diff --git a/simulator/Android.bp b/simulator/Android.bp index 8690426466..223c891da0 100644 --- a/simulator/Android.bp +++ b/simulator/Android.bp @@ -45,7 +45,7 @@ art_cc_library { shared_libs: [ "libart", "libartbase", - "libvixl-arm64", + "libvixl", ], } @@ -58,7 +58,7 @@ art_cc_library { shared_libs: [ "libartd", "libartbased", - "libvixld-arm64", + "libvixld", ], } diff --git a/test/Android.bp b/test/Android.bp index 561f95eb47..d85e2a6fca 100644 --- a/test/Android.bp +++ b/test/Android.bp @@ -59,8 +59,7 @@ art_cc_defaults { shared_libs: [ "libartd", "libartd-disassembler", - "libvixld-arm", - "libvixld-arm64", + "libvixld", "libart-gtest", "libdexfiled", "libprofiled", |