diff options
26 files changed, 14 insertions, 12 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 91515abba9..e82fefa0d5 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -60,3 +60,5 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/bin/hw/android.hardware.auto $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/hw/android.hardware.automotive*) $(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, rm -rf $(PRODUCT_OUT)/system/lib/android.hardware.tests*) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk/android.hardware.tests*) diff --git a/tests/bar/1.0/.hidl_for_test b/tests/bar/1.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/bar/1.0/.hidl_for_test diff --git a/tests/bar/1.0/Android.bp b/tests/bar/1.0/Android.bp index 2dbfb0f980..44ae7a5282 100644 --- a/tests/bar/1.0/Android.bp +++ b/tests/bar/1.0/Android.bp @@ -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++"], diff --git a/tests/baz/1.0/.hidl_for_test b/tests/baz/1.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/baz/1.0/.hidl_for_test diff --git a/tests/baz/1.0/Android.bp b/tests/baz/1.0/Android.bp index cec3039952..7fa8b272bc 100644 --- a/tests/baz/1.0/Android.bp +++ b/tests/baz/1.0/Android.bp @@ -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++"], diff --git a/tests/expression/1.0/.hidl_for_test b/tests/expression/1.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/expression/1.0/.hidl_for_test diff --git a/tests/expression/1.0/Android.bp b/tests/expression/1.0/Android.bp index 093b6607f9..0ea0acf6ae 100644 --- a/tests/expression/1.0/Android.bp +++ b/tests/expression/1.0/Android.bp @@ -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++"], diff --git a/tests/extension/light/2.0/.hidl_for_test b/tests/extension/light/2.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/extension/light/2.0/.hidl_for_test diff --git a/tests/extension/light/2.0/Android.bp b/tests/extension/light/2.0/Android.bp index 52117b41e0..e8a50174fd 100644 --- a/tests/extension/light/2.0/Android.bp +++ b/tests/extension/light/2.0/Android.bp @@ -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++"], diff --git a/tests/foo/1.0/.hidl_for_test b/tests/foo/1.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/foo/1.0/.hidl_for_test diff --git a/tests/foo/1.0/Android.bp b/tests/foo/1.0/Android.bp index d0038ab72e..b5de12e541 100644 --- a/tests/foo/1.0/Android.bp +++ b/tests/foo/1.0/Android.bp @@ -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++"], diff --git a/tests/hash/1.0/.hidl_for_test b/tests/hash/1.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/hash/1.0/.hidl_for_test diff --git a/tests/hash/1.0/Android.bp b/tests/hash/1.0/Android.bp index 336963e3fc..d4d1d1a9e2 100644 --- a/tests/hash/1.0/Android.bp +++ b/tests/hash/1.0/Android.bp @@ -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++"], diff --git a/tests/inheritance/1.0/.hidl_for_test b/tests/inheritance/1.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/inheritance/1.0/.hidl_for_test diff --git a/tests/inheritance/1.0/Android.bp b/tests/inheritance/1.0/Android.bp index a8c0e6ce38..93a8ad5182 100644 --- a/tests/inheritance/1.0/Android.bp +++ b/tests/inheritance/1.0/Android.bp @@ -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++"], diff --git a/tests/libhwbinder/1.0/.hidl_for_test b/tests/libhwbinder/1.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/libhwbinder/1.0/.hidl_for_test diff --git a/tests/libhwbinder/1.0/Android.bp b/tests/libhwbinder/1.0/Android.bp index 61326286a7..4f3beb0b32 100644 --- a/tests/libhwbinder/1.0/Android.bp +++ b/tests/libhwbinder/1.0/Android.bp @@ -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++"], diff --git a/tests/libhwbinder/aidl/.hidl_for_test b/tests/libhwbinder/aidl/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/libhwbinder/aidl/.hidl_for_test diff --git a/tests/memory/1.0/.hidl_for_test b/tests/memory/1.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/memory/1.0/.hidl_for_test diff --git a/tests/memory/1.0/Android.bp b/tests/memory/1.0/Android.bp index c5cc4a0c60..d39ba284bb 100644 --- a/tests/memory/1.0/Android.bp +++ b/tests/memory/1.0/Android.bp @@ -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++"], diff --git a/tests/msgq/1.0/.hidl_for_test b/tests/msgq/1.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/msgq/1.0/.hidl_for_test diff --git a/tests/msgq/1.0/Android.bp b/tests/msgq/1.0/Android.bp index 017e0d4a9d..7758ee86ad 100644 --- a/tests/msgq/1.0/Android.bp +++ b/tests/msgq/1.0/Android.bp @@ -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++"], diff --git a/tests/multithread/1.0/.hidl_for_test b/tests/multithread/1.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/multithread/1.0/.hidl_for_test diff --git a/tests/multithread/1.0/Android.bp b/tests/multithread/1.0/Android.bp index 68c19aa19f..76ad2c1ecb 100644 --- a/tests/multithread/1.0/Android.bp +++ b/tests/multithread/1.0/Android.bp @@ -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++"], diff --git a/tests/pointer/1.0/.hidl_for_test b/tests/pointer/1.0/.hidl_for_test new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/pointer/1.0/.hidl_for_test diff --git a/tests/pointer/1.0/Android.bp b/tests/pointer/1.0/Android.bp index 55598cacfd..178f165e38 100644 --- a/tests/pointer/1.0/Android.bp +++ b/tests/pointer/1.0/Android.bp @@ -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++"], |