Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 16:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Static link test lib shims with test -impl libs.

Browse Source 
* So that vts no longer needs to push the shim libs in hidl test.

Bug: 67500459
Test: make vts
      vts-tradefed run vts -m VtsHidlUnitTest
Change-Id: I52ad066370f08a461b848d7d96dc4a659eb2da4d
This commit is contained in:
Zhuoyao Zhang
2017-10-10 17:53:09 -07:00
committed by Steven Moreland
parent dbdd881240
commit 38a78e1fa9
11 changed files with 74 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/bar/1.0/default/Android.bp
View File

@@ -1,6 +1,6 @@
cc_library_shared {
cc_library {
name: "android.hardware.tests.bar@1.0-impl",
defaults: ["hidl_defaults"],
relative_install_path: "hw",
@@ -14,10 +14,15 @@ cc_library_shared {
"libcutils",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
"libutils",
],
// These are static libs only for testing purposes and portability. Shared
// libs should be used on device.
static_libs: [
"android.hardware.tests.foo@1.0",
"android.hardware.tests.bar@1.0",
],
}

10
tests/baz/1.0/default/Android.bp
View File

@@ -1,4 +1,4 @@
cc_library_shared {
cc_library {
name: "android.hardware.tests.baz@1.0-impl",
defaults: ["hidl_defaults"],
relative_install_path: "hw",
@@ -7,9 +7,15 @@ cc_library_shared {
],
shared_libs: [
"libbase",
"libcutils",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
"libutils",
"android.hardware.tests.baz@1.0",
],
// These are static libs only for testing purposes and portability. Shared
// libs should be used on device.
static_libs: ["android.hardware.tests.baz@1.0"],
}

10
tests/foo/1.0/default/Android.bp
View File

@@ -1,6 +1,6 @@
cc_library_shared {
cc_library {
name: "android.hardware.tests.foo@1.0-impl",
defaults: ["hidl_defaults"],
relative_install_path: "hw",
@@ -11,12 +11,16 @@ cc_library_shared {
shared_libs: [
"libbase",
"libcutils",
"libfootest",
"libhidlbase",
"libhidltransport",
"libfootest",
"libhwbinder",
"liblog",
"libutils",
"android.hardware.tests.foo@1.0",
],
// These are static libs only for testing purposes and portability. Shared
// libs should be used on device.
static_libs: ["android.hardware.tests.foo@1.0"],
}

8
tests/foo/1.0/default/lib/Android.bp
View File

@@ -1,4 +1,4 @@
cc_library_shared {
cc_library {
name: "libfootest",
defaults: ["hidl_defaults"],
srcs: [
@@ -6,10 +6,14 @@ cc_library_shared {
],
shared_libs: [
"libcutils",
"libhidlbase",
"libhidltransport",
"android.hardware.tests.foo@1.0",
"libhwbinder",
"liblog",
],
static_libs: ["android.hardware.tests.foo@1.0"],
local_include_dirs: ["include/hidl-test"],
export_include_dirs: ["include"],

10
tests/hash/1.0/default/Android.bp
View File

@@ -1,4 +1,4 @@
cc_library_shared {
cc_library {
name: "android.hardware.tests.hash@1.0-impl",
defaults: ["hidl_defaults"],
relative_install_path: "hw",
@@ -6,9 +6,15 @@ cc_library_shared {
"Hash.cpp",
],
shared_libs: [
"libcutils",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
"libutils",
"android.hardware.tests.hash@1.0",
],
// These are static libs only for testing purposes and portability. Shared
// libs should be used on device.
static_libs: ["android.hardware.tests.hash@1.0"],
}

9
tests/inheritance/1.0/default/Android.bp
View File

@@ -1,6 +1,6 @@
cc_library_shared {
cc_library {
name: "android.hardware.tests.inheritance@1.0-impl",
defaults: ["hidl_defaults"],
relative_install_path: "hw",
@@ -12,11 +12,16 @@ cc_library_shared {
shared_libs: [
"libbase",
"libcutils",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
"libutils",
"android.hardware.tests.inheritance@1.0",
],
// These are static libs only for testing purposes and portability. Shared
// libs should be used on device.
static_libs: ["android.hardware.tests.inheritance@1.0"],
}

9
tests/memory/1.0/default/Android.bp
View File

@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
cc_library_shared {
cc_library {
name: "android.hardware.tests.memory@1.0-impl",
defaults: ["hidl_defaults"],
relative_install_path: "hw",
@@ -20,12 +20,17 @@ cc_library_shared {
"MemoryTest.cpp",
],
shared_libs: [
"libcutils",
"libhidlbase",
"libhidltransport",
"libhidlmemory",
"libhwbinder",
"liblog",
"libutils",
"android.hardware.tests.memory@1.0",
"android.hidl.memory@1.0",
],
// These are static libs only for testing purposes and portability. Shared
// libs should be used on device.
static_libs: ["android.hardware.tests.memory@1.0"],
}

9
tests/multithread/1.0/default/Android.bp
View File

@@ -1,4 +1,4 @@
cc_library_shared {
cc_library {
name: "android.hardware.tests.multithread@1.0-impl",
defaults: ["hidl_defaults"],
relative_install_path: "hw",
@@ -7,10 +7,15 @@ cc_library_shared {
],
shared_libs: [
"libbase",
"libcutils",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
"libutils",
"android.hardware.tests.multithread@1.0",
],
// These are static libs only for testing purposes and portability. Shared
// libs should be used on device.
static_libs: ["android.hardware.tests.multithread@1.0"],
}

9
tests/pointer/1.0/default/Android.bp
View File

@@ -1,6 +1,6 @@
cc_library_shared {
cc_library {
name: "android.hardware.tests.pointer@1.0-impl",
defaults: ["hidl_defaults"],
relative_install_path: "hw",
@@ -11,12 +11,17 @@ cc_library_shared {
shared_libs: [
"libbase",
"libcutils",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"libpointertest",
"liblog",
"libutils",
"android.hardware.tests.pointer@1.0",
],
// These are static libs only for testing purposes and portability. Shared
// libs should be used on device.
static_libs: ["android.hardware.tests.pointer@1.0"],
}

5
tests/pointer/1.0/default/lib/Android.bp
View File

@@ -1,4 +1,4 @@
cc_library_shared {
cc_library {
name: "libpointertest",
defaults: ["hidl_defaults"],
srcs: [
@@ -10,8 +10,9 @@ cc_library_shared {
"libhidlbase",
"libhidltransport",
"liblog",
"android.hardware.tests.pointer@1.0",
],
static_libs: ["android.hardware.tests.pointer@1.0"],
local_include_dirs: ["include/hidl-test"],
export_include_dirs: ["include"],

9
tests/trie/1.0/default/Android.bp
View File

@@ -1,4 +1,4 @@
cc_library_shared {
cc_library {
name: "android.hardware.tests.trie@1.0-impl",
defaults: ["hidl_defaults"],
relative_install_path: "hw",
@@ -7,10 +7,15 @@ cc_library_shared {
],
shared_libs: [
"libbase",
"libcutils",
"libhidlbase",
"libhidltransport",
"libhwbinder",
"liblog",
"libutils",
"android.hardware.tests.trie@1.0",
],
// These are static libs only for testing purposes and portability. Shared
// libs should be used on device.
static_libs: ["android.hardware.tests.trie@1.0"],
}