diff options
| author | Paul Duffin <paulduffin@google.com> | 2019-07-12 15:30:36 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2019-07-17 13:48:31 +0100 |
| commit | d1a834716715a8719d9a406d3da5865f2f11d4c0 (patch) | |
| tree | c1da7018fb09119ba7ba7d74fd5ed37155d7390c /Android.bp | |
| parent | 1d441a745aa7dc9bb359fd1d1d09ae2156e24c6c (diff) | |
| download | vixl-d1a834716715a8719d9a406d3da5865f2f11d4c0.tar.gz | |
Export include dirs for use by art
Also changed vixl-test-runner to depend on libvixld instead of building
the code to be tested from source again. That avoided having to add
"src" to the local_include_dirs specified in "vixl-test-runner" because
the export_include_dirs specified in the defaults is not supported on
cc_test_host and so was ignored.
Test: m checkbuild
Bug: 134379140
Change-Id: Ia77a393e4fe8f11f64534b47015f1b0fc9de940c
Diffstat (limited to 'Android.bp')
| -rw-r--r-- | Android.bp | 18 |
1 files changed, 15 insertions, 3 deletions
@@ -58,7 +58,6 @@ package { cc_defaults { name: "vixl-common", host_supported: true, - srcs: ["src/*.cc"], clang_cflags: ["-Wimplicit-fallthrough"], cflags: [ "-Wall", @@ -79,7 +78,6 @@ cc_defaults { "-DVIXL_CODE_BUFFER_MALLOC", ], - local_include_dirs: ["src"], native_coverage: false, sanitize: { recover: ["shift-exponent"], @@ -137,10 +135,18 @@ libvixl_visibility = [ "//art:__subpackages__", ] +// Defaults for the libvixl[d] libraries +cc_defaults { + name: "libvixl-defaults", + srcs: ["src/*.cc"], + export_include_dirs: ["src"], +} + art_cc_library { name: "libvixl", visibility: libvixl_visibility, defaults: [ + "libvixl-defaults", "vixl-release", "vixl-arm", "vixl-arm64", @@ -160,6 +166,7 @@ art_cc_library { name: "libvixld", visibility: libvixl_visibility, defaults: [ + "libvixl-defaults", "vixl-debug", "vixl-arm", "vixl-arm64", @@ -179,12 +186,17 @@ cc_test_host { "vixl-arm", "vixl-arm64", ], - local_include_dirs: ["test"], + local_include_dirs: [ + "test", + ], srcs: [ "test/*.cc", "test/aarch32/*.cc", "test/aarch64/*.cc", ], + static_libs: [ + "libvixld", + ], data: [ "test/test-trace-reference/*", ], |