HAL interface libs for testing are now built as test lib

The HAL interfaces for testing were copied to /system/lib[64]/vndk
directory since they are built as cc_library and thus falsely recognized
as members of VNDK, which isn't true.

Build them as cc_test_library so that they are filtered out. To do so,
.hidl_for_test files are added for the test HALs and update-makefiles.sh
were ran.

Bug: 64776708
Test: no android.hardware.tests.*.so file in /system/lib[64]/vndk on
2017 pixel devices

Change-Id: I5314db6cc08a43bccfc4521d4b80b614a91e7e48
This commit is contained in:
Jiyong Park
2017-08-29 14:20:59 +09:00
parent df5dd34d65
commit 9a4b17e3e1
26 changed files with 14 additions and 12 deletions

View File

@@ -61,3 +61,5 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/hw/android.hardware.auto
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/hw/android.hardware.automotive*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/etc/init/android.hardware.automotive*)
$(call add-clean-step, find $(PRODUCT_OUT)/system $(PRODUCT_OUT)/vendor -type f -name "android\.hardware\.configstore\@1\.1*" -print0 | xargs -0 rm -f)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/android.hardware.tests*)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk/android.hardware.tests*)

View File

View File

@@ -67,7 +67,7 @@ genrule {
],
}
cc_library {
cc_test_library {
name: "android.hardware.tests.bar@1.0",
defaults: ["hidl-module-defaults"],
generated_sources: ["android.hardware.tests.bar@1.0_genc++"],

View File

View File

@@ -60,7 +60,7 @@ genrule {
],
}
cc_library {
cc_test_library {
name: "android.hardware.tests.baz@1.0",
defaults: ["hidl-module-defaults"],
generated_sources: ["android.hardware.tests.baz@1.0_genc++"],

View File

View File

@@ -42,7 +42,7 @@ genrule {
],
}
cc_library {
cc_test_library {
name: "android.hardware.tests.expression@1.0",
defaults: ["hidl-module-defaults"],
generated_sources: ["android.hardware.tests.expression@1.0_genc++"],

View File

View File

@@ -39,7 +39,7 @@ genrule {
],
}
cc_library {
cc_test_library {
name: "android.hardware.tests.extension.light@2.0",
defaults: ["hidl-module-defaults"],
generated_sources: ["android.hardware.tests.extension.light@2.0_genc++"],

View File

View File

@@ -67,7 +67,7 @@ genrule {
],
}
cc_library {
cc_test_library {
name: "android.hardware.tests.foo@1.0",
defaults: ["hidl-module-defaults"],
generated_sources: ["android.hardware.tests.foo@1.0_genc++"],

View File

View File

@@ -35,7 +35,7 @@ genrule {
],
}
cc_library {
cc_test_library {
name: "android.hardware.tests.hash@1.0",
defaults: ["hidl-module-defaults"],
generated_sources: ["android.hardware.tests.hash@1.0_genc++"],

View File

View File

@@ -56,7 +56,7 @@ genrule {
],
}
cc_library {
cc_test_library {
name: "android.hardware.tests.inheritance@1.0",
defaults: ["hidl-module-defaults"],
generated_sources: ["android.hardware.tests.inheritance@1.0_genc++"],

View File

View File

@@ -42,7 +42,7 @@ genrule {
],
}
cc_library {
cc_test_library {
name: "android.hardware.tests.libhwbinder@1.0",
defaults: ["hidl-module-defaults"],
generated_sources: ["android.hardware.tests.libhwbinder@1.0_genc++"],

View File

View File

View File

@@ -35,7 +35,7 @@ genrule {
],
}
cc_library {
cc_test_library {
name: "android.hardware.tests.memory@1.0",
defaults: ["hidl-module-defaults"],
generated_sources: ["android.hardware.tests.memory@1.0_genc++"],

View File

View File

@@ -42,7 +42,7 @@ genrule {
],
}
cc_library {
cc_test_library {
name: "android.hardware.tests.msgq@1.0",
defaults: ["hidl-module-defaults"],
generated_sources: ["android.hardware.tests.msgq@1.0_genc++"],

View File

View File

@@ -35,7 +35,7 @@ genrule {
],
}
cc_library {
cc_test_library {
name: "android.hardware.tests.multithread@1.0",
defaults: ["hidl-module-defaults"],
generated_sources: ["android.hardware.tests.multithread@1.0_genc++"],

View File

View File

@@ -42,7 +42,7 @@ genrule {
],
}
cc_library {
cc_test_library {
name: "android.hardware.tests.pointer@1.0",
defaults: ["hidl-module-defaults"],
generated_sources: ["android.hardware.tests.pointer@1.0_genc++"],