From e4d318948aa67150a33e6f25a9dce662afa14c4a Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Thu, 18 May 2017 16:14:16 -0700 Subject: [PATCH] Update makefiles. Adds default configuration to all hals. Test: pass Merged-In: Icdf6b56df82c4b7b7de815e7febea9a07ab96856 Change-Id: Icdf6b56df82c4b7b7de815e7febea9a07ab96856 --- bluetooth/1.0/Android.bp | 1 + boot/1.0/Android.bp | 1 + configstore/1.0/Android.bp | 1 + ir/1.0/Android.bp | 1 + nfc/1.0/Android.bp | 1 + radio/1.0/Android.bp | 1 + radio/deprecated/1.0/Android.bp | 1 + renderscript/1.0/Android.bp | 1 + tests/bar/1.0/Android.bp | 1 + tests/baz/1.0/Android.bp | 1 + tests/expression/1.0/Android.bp | 1 + tests/foo/1.0/Android.bp | 1 + tests/hash/1.0/Android.bp | 1 + tests/inheritance/1.0/Android.bp | 1 + tests/libhwbinder/1.0/Android.bp | 1 + tests/memory/1.0/Android.bp | 1 + tests/msgq/1.0/Android.bp | 1 + tests/pointer/1.0/Android.bp | 1 + tests/versioning/1.0/Android.bp | 1 + tests/versioning/2.2/Android.bp | 1 + tests/versioning/2.3/Android.bp | 1 + tests/versioning/2.4/Android.bp | 1 + wifi/1.0/Android.bp | 1 + wifi/supplicant/1.0/Android.bp | 1 + 24 files changed, 24 insertions(+) diff --git a/bluetooth/1.0/Android.bp b/bluetooth/1.0/Android.bp index 041b8af338..739cba144b 100644 --- a/bluetooth/1.0/Android.bp +++ b/bluetooth/1.0/Android.bp @@ -48,6 +48,7 @@ genrule { cc_library_shared { name: "android.hardware.bluetooth@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.bluetooth@1.0_genc++"], generated_headers: ["android.hardware.bluetooth@1.0_genc++_headers"], export_generated_headers: ["android.hardware.bluetooth@1.0_genc++_headers"], diff --git a/boot/1.0/Android.bp b/boot/1.0/Android.bp index d641c2bf4d..9079654eb9 100644 --- a/boot/1.0/Android.bp +++ b/boot/1.0/Android.bp @@ -41,6 +41,7 @@ genrule { cc_library_shared { name: "android.hardware.boot@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.boot@1.0_genc++"], generated_headers: ["android.hardware.boot@1.0_genc++_headers"], export_generated_headers: ["android.hardware.boot@1.0_genc++_headers"], diff --git a/configstore/1.0/Android.bp b/configstore/1.0/Android.bp index 5b36e2a26d..3b97d86962 100644 --- a/configstore/1.0/Android.bp +++ b/configstore/1.0/Android.bp @@ -41,6 +41,7 @@ genrule { cc_library_shared { name: "android.hardware.configstore@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.configstore@1.0_genc++"], generated_headers: ["android.hardware.configstore@1.0_genc++_headers"], export_generated_headers: ["android.hardware.configstore@1.0_genc++_headers"], diff --git a/ir/1.0/Android.bp b/ir/1.0/Android.bp index ae3171ae45..e47f286471 100644 --- a/ir/1.0/Android.bp +++ b/ir/1.0/Android.bp @@ -41,6 +41,7 @@ genrule { cc_library_shared { name: "android.hardware.ir@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.ir@1.0_genc++"], generated_headers: ["android.hardware.ir@1.0_genc++_headers"], export_generated_headers: ["android.hardware.ir@1.0_genc++_headers"], diff --git a/nfc/1.0/Android.bp b/nfc/1.0/Android.bp index 76ea255a58..9d450bbb80 100644 --- a/nfc/1.0/Android.bp +++ b/nfc/1.0/Android.bp @@ -48,6 +48,7 @@ genrule { cc_library_shared { name: "android.hardware.nfc@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.nfc@1.0_genc++"], generated_headers: ["android.hardware.nfc@1.0_genc++_headers"], export_generated_headers: ["android.hardware.nfc@1.0_genc++_headers"], diff --git a/radio/1.0/Android.bp b/radio/1.0/Android.bp index c95c67ffe4..443b1d9664 100644 --- a/radio/1.0/Android.bp +++ b/radio/1.0/Android.bp @@ -69,6 +69,7 @@ genrule { cc_library_shared { name: "android.hardware.radio@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.radio@1.0_genc++"], generated_headers: ["android.hardware.radio@1.0_genc++_headers"], export_generated_headers: ["android.hardware.radio@1.0_genc++_headers"], diff --git a/radio/deprecated/1.0/Android.bp b/radio/deprecated/1.0/Android.bp index 60e52a6388..c10accffd9 100644 --- a/radio/deprecated/1.0/Android.bp +++ b/radio/deprecated/1.0/Android.bp @@ -51,6 +51,7 @@ genrule { cc_library_shared { name: "android.hardware.radio.deprecated@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.radio.deprecated@1.0_genc++"], generated_headers: ["android.hardware.radio.deprecated@1.0_genc++_headers"], export_generated_headers: ["android.hardware.radio.deprecated@1.0_genc++_headers"], diff --git a/renderscript/1.0/Android.bp b/renderscript/1.0/Android.bp index 11090c3c8e..43d159c6c9 100644 --- a/renderscript/1.0/Android.bp +++ b/renderscript/1.0/Android.bp @@ -48,6 +48,7 @@ genrule { cc_library_shared { name: "android.hardware.renderscript@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.renderscript@1.0_genc++"], generated_headers: ["android.hardware.renderscript@1.0_genc++_headers"], export_generated_headers: ["android.hardware.renderscript@1.0_genc++_headers"], diff --git a/tests/bar/1.0/Android.bp b/tests/bar/1.0/Android.bp index 2b5c111dd6..989b31f631 100644 --- a/tests/bar/1.0/Android.bp +++ b/tests/bar/1.0/Android.bp @@ -69,6 +69,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.bar@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.bar@1.0_genc++"], generated_headers: ["android.hardware.tests.bar@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.bar@1.0_genc++_headers"], diff --git a/tests/baz/1.0/Android.bp b/tests/baz/1.0/Android.bp index f0cddf8fd4..80bfb097c2 100644 --- a/tests/baz/1.0/Android.bp +++ b/tests/baz/1.0/Android.bp @@ -62,6 +62,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.baz@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.baz@1.0_genc++"], generated_headers: ["android.hardware.tests.baz@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.baz@1.0_genc++_headers"], diff --git a/tests/expression/1.0/Android.bp b/tests/expression/1.0/Android.bp index f3c6d5d3a9..1fd2429929 100644 --- a/tests/expression/1.0/Android.bp +++ b/tests/expression/1.0/Android.bp @@ -44,6 +44,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.expression@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.expression@1.0_genc++"], generated_headers: ["android.hardware.tests.expression@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.expression@1.0_genc++_headers"], diff --git a/tests/foo/1.0/Android.bp b/tests/foo/1.0/Android.bp index d66ba2ded9..2876a98ddd 100644 --- a/tests/foo/1.0/Android.bp +++ b/tests/foo/1.0/Android.bp @@ -69,6 +69,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.foo@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.foo@1.0_genc++"], generated_headers: ["android.hardware.tests.foo@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.foo@1.0_genc++_headers"], diff --git a/tests/hash/1.0/Android.bp b/tests/hash/1.0/Android.bp index e88bf5f342..a8a864eb7c 100644 --- a/tests/hash/1.0/Android.bp +++ b/tests/hash/1.0/Android.bp @@ -37,6 +37,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.hash@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.hash@1.0_genc++"], generated_headers: ["android.hardware.tests.hash@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.hash@1.0_genc++_headers"], diff --git a/tests/inheritance/1.0/Android.bp b/tests/inheritance/1.0/Android.bp index db70fa21ac..7bbf079fc7 100644 --- a/tests/inheritance/1.0/Android.bp +++ b/tests/inheritance/1.0/Android.bp @@ -58,6 +58,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.inheritance@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.inheritance@1.0_genc++"], generated_headers: ["android.hardware.tests.inheritance@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.inheritance@1.0_genc++_headers"], diff --git a/tests/libhwbinder/1.0/Android.bp b/tests/libhwbinder/1.0/Android.bp index ed3657058b..28ededaa11 100644 --- a/tests/libhwbinder/1.0/Android.bp +++ b/tests/libhwbinder/1.0/Android.bp @@ -44,6 +44,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.libhwbinder@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.libhwbinder@1.0_genc++"], generated_headers: ["android.hardware.tests.libhwbinder@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.libhwbinder@1.0_genc++_headers"], diff --git a/tests/memory/1.0/Android.bp b/tests/memory/1.0/Android.bp index 523f5304f8..a3d2866110 100644 --- a/tests/memory/1.0/Android.bp +++ b/tests/memory/1.0/Android.bp @@ -37,6 +37,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.memory@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.memory@1.0_genc++"], generated_headers: ["android.hardware.tests.memory@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.memory@1.0_genc++_headers"], diff --git a/tests/msgq/1.0/Android.bp b/tests/msgq/1.0/Android.bp index 6be8cc5504..8cbfffdbc4 100644 --- a/tests/msgq/1.0/Android.bp +++ b/tests/msgq/1.0/Android.bp @@ -44,6 +44,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.msgq@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.msgq@1.0_genc++"], generated_headers: ["android.hardware.tests.msgq@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.msgq@1.0_genc++_headers"], diff --git a/tests/pointer/1.0/Android.bp b/tests/pointer/1.0/Android.bp index 0adcb4fd23..e96eb4150c 100644 --- a/tests/pointer/1.0/Android.bp +++ b/tests/pointer/1.0/Android.bp @@ -44,6 +44,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.pointer@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.pointer@1.0_genc++"], generated_headers: ["android.hardware.tests.pointer@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.pointer@1.0_genc++_headers"], diff --git a/tests/versioning/1.0/Android.bp b/tests/versioning/1.0/Android.bp index f0a14bc3f5..839d4b9b07 100644 --- a/tests/versioning/1.0/Android.bp +++ b/tests/versioning/1.0/Android.bp @@ -37,6 +37,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.versioning@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.versioning@1.0_genc++"], generated_headers: ["android.hardware.tests.versioning@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tests.versioning@1.0_genc++_headers"], diff --git a/tests/versioning/2.2/Android.bp b/tests/versioning/2.2/Android.bp index b6fd7443ff..500222cbf9 100644 --- a/tests/versioning/2.2/Android.bp +++ b/tests/versioning/2.2/Android.bp @@ -44,6 +44,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.versioning@2.2", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.versioning@2.2_genc++"], generated_headers: ["android.hardware.tests.versioning@2.2_genc++_headers"], export_generated_headers: ["android.hardware.tests.versioning@2.2_genc++_headers"], diff --git a/tests/versioning/2.3/Android.bp b/tests/versioning/2.3/Android.bp index 47411172ff..f4123e480f 100644 --- a/tests/versioning/2.3/Android.bp +++ b/tests/versioning/2.3/Android.bp @@ -51,6 +51,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.versioning@2.3", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.versioning@2.3_genc++"], generated_headers: ["android.hardware.tests.versioning@2.3_genc++_headers"], export_generated_headers: ["android.hardware.tests.versioning@2.3_genc++_headers"], diff --git a/tests/versioning/2.4/Android.bp b/tests/versioning/2.4/Android.bp index f576bf13e8..dce68bac1a 100644 --- a/tests/versioning/2.4/Android.bp +++ b/tests/versioning/2.4/Android.bp @@ -37,6 +37,7 @@ genrule { cc_library_shared { name: "android.hardware.tests.versioning@2.4", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.tests.versioning@2.4_genc++"], generated_headers: ["android.hardware.tests.versioning@2.4_genc++_headers"], export_generated_headers: ["android.hardware.tests.versioning@2.4_genc++_headers"], diff --git a/wifi/1.0/Android.bp b/wifi/1.0/Android.bp index 7289e8aebe..2022640adb 100644 --- a/wifi/1.0/Android.bp +++ b/wifi/1.0/Android.bp @@ -125,6 +125,7 @@ genrule { cc_library_shared { name: "android.hardware.wifi@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.wifi@1.0_genc++"], generated_headers: ["android.hardware.wifi@1.0_genc++_headers"], export_generated_headers: ["android.hardware.wifi@1.0_genc++_headers"], diff --git a/wifi/supplicant/1.0/Android.bp b/wifi/supplicant/1.0/Android.bp index 883d600310..ab7948bf44 100644 --- a/wifi/supplicant/1.0/Android.bp +++ b/wifi/supplicant/1.0/Android.bp @@ -118,6 +118,7 @@ genrule { cc_library_shared { name: "android.hardware.wifi.supplicant@1.0", + defaults: ["hidl-module-defaults"], generated_sources: ["android.hardware.wifi.supplicant@1.0_genc++"], generated_headers: ["android.hardware.wifi.supplicant@1.0_genc++_headers"], export_generated_headers: ["android.hardware.wifi.supplicant@1.0_genc++_headers"],