Update Android.bp HIDL makefiles

Allow HAL definition libs to be static. Bug: 32920003 Bug: 64040096 Test: update-all-google-makefiles.sh Change-Id: I1483d572bea6799717d1614fb7d52fe225e31104
2026-02-01 11:36:00 +00:00 · 2017-08-02 15:19:22 -07:00
parent 7dcc345b64
commit f5d136c231
54 changed files with 53 additions and 57 deletions
--- a/audio/2.0/Android.bp
+++ b/audio/2.0/Android.bp
@@ -81,7 +81,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.audio@2.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.audio@2.0_genc++"],
--- a/audio/common/2.0/Android.bp
+++ b/audio/common/2.0/Android.bp
@@ -32,7 +32,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.audio.common@2.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.audio.common@2.0_genc++"],
--- a/audio/effect/2.0/Android.bp
+++ b/audio/effect/2.0/Android.bp
@@ -130,7 +130,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.audio.effect@2.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.audio.effect@2.0_genc++"],
--- a/automotive/evs/1.0/Android.bp
+++ b/automotive/evs/1.0/Android.bp
@@ -60,7 +60,7 @@ genrule {
    ],
 }

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

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

-cc_library_shared {
+cc_library {
    name: "android.hardware.automotive.vehicle@2.1",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.automotive.vehicle@2.1_genc++"],
--- a/biometrics/fingerprint/2.1/Android.bp
+++ b/biometrics/fingerprint/2.1/Android.bp
@@ -46,7 +46,7 @@ genrule {
    ],
 }

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

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

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

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

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

-cc_library_shared {
+cc_library {
    name: "android.hardware.camera.device@3.2",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.camera.device@3.2_genc++"],
--- a/camera/metadata/3.2/Android.bp
+++ b/camera/metadata/3.2/Android.bp
@@ -32,7 +32,7 @@ genrule {
    ],
 }

-cc_library_shared {
+cc_library {
    name: "android.hardware.camera.metadata@3.2",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.camera.metadata@3.2_genc++"],
--- a/camera/provider/2.4/Android.bp
+++ b/camera/provider/2.4/Android.bp
@@ -42,7 +42,7 @@ genrule {
    ],
 }

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

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

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

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

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

-cc_library_shared {
+cc_library {
    name: "android.hardware.drm@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.drm@1.0_genc++"],
@@ -89,5 +89,3 @@ cc_library_shared {
        "libutils",
    ],
 }
-
-subdirs = ["default"]
--- a/drm/Android.bp
+++ b/drm/Android.bp
@@ -1,5 +1,6 @@
 // This is an autogenerated file, do not edit.
 subdirs = [
    "1.0",
+    "1.0/default",
    "1.0/vts/functional",
 ]
--- a/dumpstate/1.0/Android.bp
+++ b/dumpstate/1.0/Android.bp
@@ -35,7 +35,7 @@ genrule {
    ],
 }

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

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

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

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

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

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

-cc_library_shared {
+cc_library {
    name: "android.hardware.graphics.composer@2.1",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.graphics.composer@2.1_genc++"],
--- a/graphics/mapper/2.0/Android.bp
+++ b/graphics/mapper/2.0/Android.bp
@@ -39,7 +39,7 @@ genrule {
    ],
 }

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

-cc_library_shared {
+cc_library {
    name: "android.hardware.health@1.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.health@1.0_genc++"],
--- a/health/1.0/default/Android.bp
+++ b/health/1.0/default/Android.bp
@@ -1,7 +1,3 @@
-subdirs = [
-    "libhealthd",
-]
-
 cc_library_static {
    name: "android.hardware.health@1.0-convert",
    vendor_available: true,
--- a/health/Android.bp
+++ b/health/Android.bp
@@ -2,5 +2,6 @@
 subdirs = [
    "1.0",
    "1.0/default",
+    "1.0/default/libhealthd",
    "1.0/vts/functional",
 ]
--- a/keymaster/3.0/Android.bp
+++ b/keymaster/3.0/Android.bp
@@ -39,7 +39,7 @@ genrule {
    ],
 }

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

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

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

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

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

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

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

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

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

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

-cc_library_shared {
+cc_library {
    name: "android.hardware.soundtrigger@2.0",
    defaults: ["hidl-module-defaults"],
    generated_sources: ["android.hardware.soundtrigger@2.0_genc++"],
--- a/tests/extension/light/2.0/Android.bp
+++ b/tests/extension/light/2.0/Android.bp
@@ -39,7 +39,7 @@ genrule {
    ],
 }

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

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

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

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

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

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

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

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

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

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

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

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