Merge "Graphics tests statically link to HAL definition libs." into oc-mr1-dev

am: 43b3865a3d

Change-Id: Ie106164654b71e74ca7db23d2b53b41ab314072d
This commit is contained in:
Tri Vo
2017-08-10 03:49:31 +00:00
committed by android-build-merger
2 changed files with 13 additions and 39 deletions

View File

@@ -44,33 +44,21 @@ cc_library_static {
cc_test {
name: "VtsHalGraphicsComposerV2_1TargetTest",
defaults: ["hidl_defaults"],
defaults: ["VtsHalTargetTestDefaults"],
srcs: ["VtsHalGraphicsComposerV2_1TargetTest.cpp"],
// TODO(b/64437680): Assume these libs are always available on the device.
shared_libs: [
"libfmq",
"libsync",
],
static_libs: [
"android.hardware.graphics.allocator@2.0",
"android.hardware.graphics.composer@2.1",
"android.hardware.graphics.mapper@2.0",
"libbase",
"libcutils",
"libfmq",
"libhidlbase",
"libhidltransport",
"liblog",
"libnativehelper",
"libsync",
"libutils",
],
static_libs: [
"libhwcomposer-command-buffer",
"libVtsHalGraphicsComposerTestUtils",
"libVtsHalGraphicsMapperTestUtils",
"VtsHalHidlTargetTestBase",
"libhwcomposer-command-buffer",
"libnativehelper",
],
cflags: [
"-Wall",
"-Wextra",
"-Werror",
"-O0",
"-g",
]
}

View File

@@ -37,30 +37,16 @@ cc_library_static {
cc_test {
name: "VtsHalGraphicsMapperV2_0TargetTest",
defaults: ["hidl_defaults"],
defaults: ["VtsHalTargetTestDefaults"],
srcs: ["VtsHalGraphicsMapperV2_0TargetTest.cpp"],
shared_libs: [
"libbase",
"liblog",
"libcutils",
"libhidlbase",
"libhidltransport",
"libnativehelper",
"libsync",
"libutils",
],
static_libs: [
"android.hardware.graphics.allocator@2.0",
"android.hardware.graphics.mapper@2.0",
"android.hardware.graphics.common@1.0",
],
static_libs: [
"libVtsHalGraphicsMapperTestUtils",
"VtsHalHidlTargetTestBase",
"libnativehelper",
],
cflags: [
"-Wall",
"-Wextra",
"-Werror",
"-O0",
"-g",
]
}