Merge "Update HIDL makefiles." am: 49dad304a5

am: 68a25d22e3 Change-Id: I98400033b6e49696bc27930153a6747665235a98
2026-02-01 16:50:18 +00:00 · 2017-07-31 19:36:37 +00:00
parent 39e2d42dcb 68a25d22e3
commit 27e608f01c
24 changed files with 24 additions and 24 deletions
--- a/bluetooth/1.0/Android.bp
+++ b/bluetooth/1.0/Android.bp
@@ -46,7 +46,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.bluetooth@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.bluetooth@1.0_genc++"],
--- a/boot/1.0/Android.bp
+++ b/boot/1.0/Android.bp
@@ -39,7 +39,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.boot@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.boot@1.0_genc++"],
--- a/configstore/1.0/Android.bp
+++ b/configstore/1.0/Android.bp
@@ -39,7 +39,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.configstore@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.configstore@1.0_genc++"],
--- a/ir/1.0/Android.bp
+++ b/ir/1.0/Android.bp
@@ -39,7 +39,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.ir@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.ir@1.0_genc++"],
--- a/nfc/1.0/Android.bp
+++ b/nfc/1.0/Android.bp
@@ -46,7 +46,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.nfc@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.nfc@1.0_genc++"],
--- a/radio/1.0/Android.bp
+++ b/radio/1.0/Android.bp
@@ -67,7 +67,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.radio@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.radio@1.0_genc++"],
--- a/radio/1.1/Android.bp
+++ b/radio/1.1/Android.bp
@@ -53,7 +53,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.radio@1.1",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.radio@1.1_genc++"],
--- a/radio/deprecated/1.0/Android.bp
+++ b/radio/deprecated/1.0/Android.bp
@@ -49,7 +49,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.radio.deprecated@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.radio.deprecated@1.0_genc++"],
--- a/renderscript/1.0/Android.bp
+++ b/renderscript/1.0/Android.bp
@@ -46,7 +46,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.renderscript@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.renderscript@1.0_genc++"],
--- a/tests/bar/1.0/Android.bp
+++ b/tests/bar/1.0/Android.bp
@@ -67,7 +67,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.tests.bar@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.tests.bar@1.0_genc++"],
--- a/tests/baz/1.0/Android.bp
+++ b/tests/baz/1.0/Android.bp
@@ -60,7 +60,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.tests.baz@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.tests.baz@1.0_genc++"],
--- a/tests/expression/1.0/Android.bp
+++ b/tests/expression/1.0/Android.bp
@@ -42,7 +42,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.tests.expression@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.tests.expression@1.0_genc++"],
--- a/tests/foo/1.0/Android.bp
+++ b/tests/foo/1.0/Android.bp
@@ -67,7 +67,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.tests.foo@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.tests.foo@1.0_genc++"],
--- a/tests/hash/1.0/Android.bp
+++ b/tests/hash/1.0/Android.bp
@@ -35,7 +35,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.tests.hash@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.tests.hash@1.0_genc++"],
--- a/tests/inheritance/1.0/Android.bp
+++ b/tests/inheritance/1.0/Android.bp
@@ -56,7 +56,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.tests.inheritance@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.tests.inheritance@1.0_genc++"],
--- a/tests/libhwbinder/1.0/Android.bp
+++ b/tests/libhwbinder/1.0/Android.bp
@@ -42,7 +42,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.tests.libhwbinder@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.tests.libhwbinder@1.0_genc++"],
--- a/tests/memory/1.0/Android.bp
+++ b/tests/memory/1.0/Android.bp
@@ -35,7 +35,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.tests.memory@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.tests.memory@1.0_genc++"],
--- a/tests/msgq/1.0/Android.bp
+++ b/tests/msgq/1.0/Android.bp
@@ -42,7 +42,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.tests.msgq@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.tests.msgq@1.0_genc++"],
--- a/tests/multithread/1.0/Android.bp
+++ b/tests/multithread/1.0/Android.bp
@@ -35,7 +35,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.tests.multithread@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.tests.multithread@1.0_genc++"],
--- a/tests/pointer/1.0/Android.bp
+++ b/tests/pointer/1.0/Android.bp
@@ -42,7 +42,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.tests.pointer@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.tests.pointer@1.0_genc++"],
--- a/tetheroffload/config/1.0/Android.bp
+++ b/tetheroffload/config/1.0/Android.bp
@@ -35,7 +35,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.tetheroffload.config@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.tetheroffload.config@1.0_genc++"],
--- a/tetheroffload/control/1.0/Android.bp
+++ b/tetheroffload/control/1.0/Android.bp
@@ -46,7 +46,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.tetheroffload.control@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.tetheroffload.control@1.0_genc++"],
--- a/wifi/1.0/Android.bp
+++ b/wifi/1.0/Android.bp
@@ -123,7 +123,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.wifi@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.wifi@1.0_genc++"],
--- a/wifi/supplicant/1.0/Android.bp
+++ b/wifi/supplicant/1.0/Android.bp
@@ -116,7 +116,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.wifi.supplicant@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.wifi.supplicant@1.0_genc++"],