Update make file for vndk enabled.

Update the Android.bp generated with hidl-gen. Test: build with and without BOARD_VNDK_VERSION=current Bug: 63866913 Change-Id: I1a9db1df49e0f13c5790da2b118ae9ec63ba34a7
2026-02-01 10:44:41 +00:00 · 2017-08-04 14:12:23 +09:00
parent d9b12c13e5
commit 608d773ef8
51 changed files with 153 additions and 0 deletions
--- a/audio/2.0/Android.bp
+++ b/audio/2.0/Android.bp
@@ -88,6 +88,9 @@ cc_library {
    generated_headers: ["android.hardware.audio@2.0_genc++_headers"],
    export_generated_headers: ["android.hardware.audio@2.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/audio/common/2.0/Android.bp
+++ b/audio/common/2.0/Android.bp
@@ -39,6 +39,9 @@ cc_library {
    generated_headers: ["android.hardware.audio.common@2.0_genc++_headers"],
    export_generated_headers: ["android.hardware.audio.common@2.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/audio/effect/2.0/Android.bp
+++ b/audio/effect/2.0/Android.bp
@@ -137,6 +137,9 @@ cc_library {
    generated_headers: ["android.hardware.audio.effect@2.0_genc++_headers"],
    export_generated_headers: ["android.hardware.audio.effect@2.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/automotive/evs/1.0/Android.bp
+++ b/automotive/evs/1.0/Android.bp
@@ -67,6 +67,9 @@ cc_library {
    generated_headers: ["android.hardware.automotive.evs@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.automotive.evs@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/automotive/vehicle/2.0/Android.bp
+++ b/automotive/vehicle/2.0/Android.bp
@@ -53,6 +53,9 @@ cc_library {
    generated_headers: ["android.hardware.automotive.vehicle@2.0_genc++_headers"],
    export_generated_headers: ["android.hardware.automotive.vehicle@2.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/automotive/vehicle/2.1/Android.bp
+++ b/automotive/vehicle/2.1/Android.bp
@@ -46,6 +46,9 @@ cc_library {
    generated_headers: ["android.hardware.automotive.vehicle@2.1_genc++_headers"],
    export_generated_headers: ["android.hardware.automotive.vehicle@2.1_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/biometrics/fingerprint/2.1/Android.bp
+++ b/biometrics/fingerprint/2.1/Android.bp
@@ -53,6 +53,9 @@ cc_library {
    generated_headers: ["android.hardware.biometrics.fingerprint@2.1_genc++_headers"],
    export_generated_headers: ["android.hardware.biometrics.fingerprint@2.1_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/broadcastradio/1.0/Android.bp
+++ b/broadcastradio/1.0/Android.bp
@@ -67,6 +67,9 @@ cc_library {
    generated_headers: ["android.hardware.broadcastradio@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.broadcastradio@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/broadcastradio/1.1/Android.bp
+++ b/broadcastradio/1.1/Android.bp
@@ -67,6 +67,9 @@ cc_library {
    generated_headers: ["android.hardware.broadcastradio@1.1_genc++_headers"],
    export_generated_headers: ["android.hardware.broadcastradio@1.1_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/camera/common/1.0/Android.bp
+++ b/camera/common/1.0/Android.bp
@@ -39,6 +39,9 @@ cc_library {
    generated_headers: ["android.hardware.camera.common@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.camera.common@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/camera/device/1.0/Android.bp
+++ b/camera/device/1.0/Android.bp
@@ -60,6 +60,9 @@ cc_library {
    generated_headers: ["android.hardware.camera.device@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.camera.device@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/camera/device/3.2/Android.bp
+++ b/camera/device/3.2/Android.bp
@@ -60,6 +60,9 @@ cc_library {
    generated_headers: ["android.hardware.camera.device@3.2_genc++_headers"],
    export_generated_headers: ["android.hardware.camera.device@3.2_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/camera/metadata/3.2/Android.bp
+++ b/camera/metadata/3.2/Android.bp
@@ -39,6 +39,9 @@ cc_library {
    generated_headers: ["android.hardware.camera.metadata@3.2_genc++_headers"],
    export_generated_headers: ["android.hardware.camera.metadata@3.2_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/camera/provider/2.4/Android.bp
+++ b/camera/provider/2.4/Android.bp
@@ -49,6 +49,9 @@ cc_library {
    generated_headers: ["android.hardware.camera.provider@2.4_genc++_headers"],
    export_generated_headers: ["android.hardware.camera.provider@2.4_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/cas/1.0/Android.bp
+++ b/cas/1.0/Android.bp
@@ -67,6 +67,9 @@ cc_library {
    generated_headers: ["android.hardware.cas@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.cas@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/cas/native/1.0/Android.bp
+++ b/cas/native/1.0/Android.bp
@@ -46,6 +46,9 @@ cc_library {
    generated_headers: ["android.hardware.cas.native@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.cas.native@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/configstore/1.1/Android.bp
+++ b/configstore/1.1/Android.bp
@@ -42,6 +42,9 @@ cc_library {
    generated_headers: ["android.hardware.configstore@1.1_genc++_headers"],
    export_generated_headers: ["android.hardware.configstore@1.1_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/contexthub/1.0/Android.bp
+++ b/contexthub/1.0/Android.bp
@@ -53,6 +53,9 @@ cc_library {
    generated_headers: ["android.hardware.contexthub@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.contexthub@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/drm/1.0/Android.bp
+++ b/drm/1.0/Android.bp
@@ -74,6 +74,9 @@ cc_library {
    generated_headers: ["android.hardware.drm@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.drm@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/dumpstate/1.0/Android.bp
+++ b/dumpstate/1.0/Android.bp
@@ -42,6 +42,9 @@ cc_library {
    generated_headers: ["android.hardware.dumpstate@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.dumpstate@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/gatekeeper/1.0/Android.bp
+++ b/gatekeeper/1.0/Android.bp
@@ -46,6 +46,9 @@ cc_library {
    generated_headers: ["android.hardware.gatekeeper@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.gatekeeper@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/gnss/1.0/Android.bp
+++ b/gnss/1.0/Android.bp
@@ -179,6 +179,9 @@ cc_library {
    generated_headers: ["android.hardware.gnss@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.gnss@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/graphics/allocator/2.0/Android.bp
+++ b/graphics/allocator/2.0/Android.bp
@@ -42,6 +42,9 @@ cc_library {
    generated_headers: ["android.hardware.graphics.allocator@2.0_genc++_headers"],
    export_generated_headers: ["android.hardware.graphics.allocator@2.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/graphics/bufferqueue/1.0/Android.bp
+++ b/graphics/bufferqueue/1.0/Android.bp
@@ -49,6 +49,9 @@ cc_library {
    generated_headers: ["android.hardware.graphics.bufferqueue@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.graphics.bufferqueue@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/graphics/common/1.0/Android.bp
+++ b/graphics/common/1.0/Android.bp
@@ -39,6 +39,9 @@ cc_library {
    generated_headers: ["android.hardware.graphics.common@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.graphics.common@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/graphics/composer/2.1/Android.bp
+++ b/graphics/composer/2.1/Android.bp
@@ -60,6 +60,9 @@ cc_library {
    generated_headers: ["android.hardware.graphics.composer@2.1_genc++_headers"],
    export_generated_headers: ["android.hardware.graphics.composer@2.1_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/graphics/mapper/2.0/Android.bp
+++ b/graphics/mapper/2.0/Android.bp
@@ -46,6 +46,9 @@ cc_library {
    generated_headers: ["android.hardware.graphics.mapper@2.0_genc++_headers"],
    export_generated_headers: ["android.hardware.graphics.mapper@2.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/health/1.0/Android.bp
+++ b/health/1.0/Android.bp
@@ -46,6 +46,9 @@ cc_library {
    generated_headers: ["android.hardware.health@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.health@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/keymaster/3.0/Android.bp
+++ b/keymaster/3.0/Android.bp
@@ -46,6 +46,9 @@ cc_library {
    generated_headers: ["android.hardware.keymaster@3.0_genc++_headers"],
    export_generated_headers: ["android.hardware.keymaster@3.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/light/2.0/Android.bp
+++ b/light/2.0/Android.bp
@@ -46,6 +46,9 @@ cc_library {
    generated_headers: ["android.hardware.light@2.0_genc++_headers"],
    export_generated_headers: ["android.hardware.light@2.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/media/1.0/Android.bp
+++ b/media/1.0/Android.bp
@@ -39,6 +39,9 @@ cc_library {
    generated_headers: ["android.hardware.media@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.media@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/media/omx/1.0/Android.bp
+++ b/media/omx/1.0/Android.bp
@@ -81,6 +81,9 @@ cc_library {
    generated_headers: ["android.hardware.media.omx@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.media.omx@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/memtrack/1.0/Android.bp
+++ b/memtrack/1.0/Android.bp
@@ -46,6 +46,9 @@ cc_library {
    generated_headers: ["android.hardware.memtrack@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.memtrack@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/neuralnetworks/1.0/Android.bp
+++ b/neuralnetworks/1.0/Android.bp
@@ -53,6 +53,9 @@ cc_library {
    generated_headers: ["android.hardware.neuralnetworks@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.neuralnetworks@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/oemlock/1.0/Android.bp
+++ b/oemlock/1.0/Android.bp
@@ -46,6 +46,9 @@ cc_library {
    generated_headers: ["android.hardware.oemlock@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.oemlock@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/power/1.0/Android.bp
+++ b/power/1.0/Android.bp
@@ -46,6 +46,9 @@ cc_library {
    generated_headers: ["android.hardware.power@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.power@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/power/1.1/Android.bp
+++ b/power/1.1/Android.bp
@@ -46,6 +46,9 @@ cc_library {
    generated_headers: ["android.hardware.power@1.1_genc++_headers"],
    export_generated_headers: ["android.hardware.power@1.1_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/sensors/1.0/Android.bp
+++ b/sensors/1.0/Android.bp
@@ -46,6 +46,9 @@ cc_library {
    generated_headers: ["android.hardware.sensors@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.sensors@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/soundtrigger/2.0/Android.bp
+++ b/soundtrigger/2.0/Android.bp
@@ -53,6 +53,9 @@ cc_library {
    generated_headers: ["android.hardware.soundtrigger@2.0_genc++_headers"],
    export_generated_headers: ["android.hardware.soundtrigger@2.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/tests/extension/light/2.0/Android.bp
+++ b/tests/extension/light/2.0/Android.bp
@@ -46,6 +46,9 @@ cc_library {
    generated_headers: ["android.hardware.tests.extension.light@2.0_genc++_headers"],
    export_generated_headers: ["android.hardware.tests.extension.light@2.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/thermal/1.0/Android.bp
+++ b/thermal/1.0/Android.bp
@@ -46,6 +46,9 @@ cc_library {
    generated_headers: ["android.hardware.thermal@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.thermal@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/tv/cec/1.0/Android.bp
+++ b/tv/cec/1.0/Android.bp
@@ -53,6 +53,9 @@ cc_library {
    generated_headers: ["android.hardware.tv.cec@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.tv.cec@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/tv/input/1.0/Android.bp
+++ b/tv/input/1.0/Android.bp
@@ -53,6 +53,9 @@ cc_library {
    generated_headers: ["android.hardware.tv.input@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.tv.input@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/usb/1.0/Android.bp
+++ b/usb/1.0/Android.bp
@@ -53,6 +53,9 @@ cc_library {
    generated_headers: ["android.hardware.usb@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.usb@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/usb/1.1/Android.bp
+++ b/usb/1.1/Android.bp
@@ -53,6 +53,9 @@ cc_library {
    generated_headers: ["android.hardware.usb@1.1_genc++_headers"],
    export_generated_headers: ["android.hardware.usb@1.1_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/vibrator/1.0/Android.bp
+++ b/vibrator/1.0/Android.bp
@@ -46,6 +46,9 @@ cc_library {
    generated_headers: ["android.hardware.vibrator@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.vibrator@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/vibrator/1.1/Android.bp
+++ b/vibrator/1.1/Android.bp
@@ -46,6 +46,9 @@ cc_library {
    generated_headers: ["android.hardware.vibrator@1.1_genc++_headers"],
    export_generated_headers: ["android.hardware.vibrator@1.1_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/vr/1.0/Android.bp
+++ b/vr/1.0/Android.bp
@@ -42,6 +42,9 @@ cc_library {
    generated_headers: ["android.hardware.vr@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.vr@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/weaver/1.0/Android.bp
+++ b/weaver/1.0/Android.bp
@@ -46,6 +46,9 @@ cc_library {
    generated_headers: ["android.hardware.weaver@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.weaver@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/wifi/1.1/Android.bp
+++ b/wifi/1.1/Android.bp
@@ -49,6 +49,9 @@ cc_library {
    generated_headers: ["android.hardware.wifi@1.1_genc++_headers"],
    export_generated_headers: ["android.hardware.wifi@1.1_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",
--- a/wifi/offload/1.0/Android.bp
+++ b/wifi/offload/1.0/Android.bp
@@ -53,6 +53,9 @@ cc_library {
    generated_headers: ["android.hardware.wifi.offload@1.0_genc++_headers"],
    export_generated_headers: ["android.hardware.wifi.offload@1.0_genc++_headers"],
    vendor_available: true,
+    vndk: {
+        enabled: true,
+    },
    shared_libs: [
        "libhidlbase",
        "libhidltransport",