Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a4b17e3 authored by Jiyong Park's avatar Jiyong Park
Browse files

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
parent df5dd34d

CleanSpec.mk

+2 −0
Original line number Diff line number Diff line
@@ -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*)

tests/bar/1.0/.hidl_for_test

0 → 100644
+0 −0

Empty file added.

tests/bar/1.0/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -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++"],

tests/baz/1.0/.hidl_for_test

0 → 100644
+0 −0

Empty file added.

tests/baz/1.0/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -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++"],