diff options
| author | Steven Moreland <smoreland@google.com> | 2017-04-11 09:58:03 -0700 |
|---|---|---|
| committer | Steven Moreland <smoreland@google.com> | 2017-04-11 09:58:03 -0700 |
| commit | 3b36a83a2e2f96e4cbcc9d022bebd0e59205c5af (patch) | |
| tree | 2588288090a86646a00338cf805b72d8db6e5207 | |
| parent | b2799c370f5f278d24bcf86b49d49ede4f0bfdb2 (diff) | |
| download | android_hardware_interfaces-3b36a83a2e2f96e4cbcc9d022bebd0e59205c5af.tar.gz android_hardware_interfaces-3b36a83a2e2f96e4cbcc9d022bebd0e59205c5af.tar.bz2 android_hardware_interfaces-3b36a83a2e2f96e4cbcc9d022bebd0e59205c5af.zip | |
Update makefiles (2/2).
Test: pass
Change-Id: Ic7e6289c7b69785491708ce0acbb657f4c704229
41 files changed, 79 insertions, 1 deletions
diff --git a/audio/2.0/Android.bp b/audio/2.0/Android.bp index f7975eca3..9aa9e2c4b 100644 --- a/audio/2.0/Android.bp +++ b/audio/2.0/Android.bp @@ -86,6 +86,7 @@ cc_library_shared { generated_sources: ["android.hardware.audio@2.0_genc++"], generated_headers: ["android.hardware.audio@2.0_genc++_headers"], export_generated_headers: ["android.hardware.audio@2.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/audio/common/2.0/Android.bp b/audio/common/2.0/Android.bp index ad599edf4..fa80d20d5 100644 --- a/audio/common/2.0/Android.bp +++ b/audio/common/2.0/Android.bp @@ -37,6 +37,7 @@ cc_library_shared { generated_sources: ["android.hardware.audio.common@2.0_genc++"], generated_headers: ["android.hardware.audio.common@2.0_genc++_headers"], export_generated_headers: ["android.hardware.audio.common@2.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/audio/effect/2.0/Android.bp b/audio/effect/2.0/Android.bp index 937a4e62f..fea2a3359 100644 --- a/audio/effect/2.0/Android.bp +++ b/audio/effect/2.0/Android.bp @@ -135,6 +135,7 @@ cc_library_shared { generated_sources: ["android.hardware.audio.effect@2.0_genc++"], generated_headers: ["android.hardware.audio.effect@2.0_genc++_headers"], export_generated_headers: ["android.hardware.audio.effect@2.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/automotive/evs/1.0/Android.bp b/automotive/evs/1.0/Android.bp index ec56c8fe4..a9f094fe6 100644 --- a/automotive/evs/1.0/Android.bp +++ b/automotive/evs/1.0/Android.bp @@ -65,6 +65,7 @@ cc_library_shared { generated_sources: ["android.hardware.automotive.evs@1.0_genc++"], generated_headers: ["android.hardware.automotive.evs@1.0_genc++_headers"], export_generated_headers: ["android.hardware.automotive.evs@1.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/automotive/vehicle/2.0/Android.bp b/automotive/vehicle/2.0/Android.bp index 6957bf801..b6fde6e72 100644 --- a/automotive/vehicle/2.0/Android.bp +++ b/automotive/vehicle/2.0/Android.bp @@ -51,6 +51,7 @@ cc_library_shared { generated_sources: ["android.hardware.automotive.vehicle@2.0_genc++"], generated_headers: ["android.hardware.automotive.vehicle@2.0_genc++_headers"], export_generated_headers: ["android.hardware.automotive.vehicle@2.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/automotive/vehicle/2.1/Android.bp b/automotive/vehicle/2.1/Android.bp index 825ec1f66..536950a4a 100644 --- a/automotive/vehicle/2.1/Android.bp +++ b/automotive/vehicle/2.1/Android.bp @@ -44,6 +44,7 @@ cc_library_shared { generated_sources: ["android.hardware.automotive.vehicle@2.1_genc++"], generated_headers: ["android.hardware.automotive.vehicle@2.1_genc++_headers"], export_generated_headers: ["android.hardware.automotive.vehicle@2.1_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/biometrics/fingerprint/2.1/Android.bp b/biometrics/fingerprint/2.1/Android.bp index e928f9bbc..9a6e9d894 100644 --- a/biometrics/fingerprint/2.1/Android.bp +++ b/biometrics/fingerprint/2.1/Android.bp @@ -51,6 +51,7 @@ cc_library_shared { generated_sources: ["android.hardware.biometrics.fingerprint@2.1_genc++"], generated_headers: ["android.hardware.biometrics.fingerprint@2.1_genc++_headers"], export_generated_headers: ["android.hardware.biometrics.fingerprint@2.1_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/broadcastradio/1.0/Android.bp b/broadcastradio/1.0/Android.bp index 5f507481a..cbed9f758 100644 --- a/broadcastradio/1.0/Android.bp +++ b/broadcastradio/1.0/Android.bp @@ -65,6 +65,7 @@ cc_library_shared { generated_sources: ["android.hardware.broadcastradio@1.0_genc++"], generated_headers: ["android.hardware.broadcastradio@1.0_genc++_headers"], export_generated_headers: ["android.hardware.broadcastradio@1.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/broadcastradio/1.1/Android.bp b/broadcastradio/1.1/Android.bp index cc0747a42..2c51ca54a 100644 --- a/broadcastradio/1.1/Android.bp +++ b/broadcastradio/1.1/Android.bp @@ -65,6 +65,7 @@ cc_library_shared { generated_sources: ["android.hardware.broadcastradio@1.1_genc++"], generated_headers: ["android.hardware.broadcastradio@1.1_genc++_headers"], export_generated_headers: ["android.hardware.broadcastradio@1.1_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/camera/common/1.0/Android.bp b/camera/common/1.0/Android.bp index 80b5e54af..76f1cf3e2 100644 --- a/camera/common/1.0/Android.bp +++ b/camera/common/1.0/Android.bp @@ -37,6 +37,7 @@ cc_library_shared { generated_sources: ["android.hardware.camera.common@1.0_genc++"], generated_headers: ["android.hardware.camera.common@1.0_genc++_headers"], export_generated_headers: ["android.hardware.camera.common@1.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/camera/device/1.0/Android.bp b/camera/device/1.0/Android.bp index 81e41aa0a..0b65892d6 100644 --- a/camera/device/1.0/Android.bp +++ b/camera/device/1.0/Android.bp @@ -58,6 +58,7 @@ cc_library_shared { generated_sources: ["android.hardware.camera.device@1.0_genc++"], generated_headers: ["android.hardware.camera.device@1.0_genc++_headers"], export_generated_headers: ["android.hardware.camera.device@1.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/camera/device/3.2/Android.bp b/camera/device/3.2/Android.bp index 7807a857a..cbfdcff0d 100644 --- a/camera/device/3.2/Android.bp +++ b/camera/device/3.2/Android.bp @@ -58,6 +58,7 @@ cc_library_shared { generated_sources: ["android.hardware.camera.device@3.2_genc++"], generated_headers: ["android.hardware.camera.device@3.2_genc++_headers"], export_generated_headers: ["android.hardware.camera.device@3.2_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/camera/metadata/3.2/Android.bp b/camera/metadata/3.2/Android.bp index d6bb9a36b..0534b9c00 100644 --- a/camera/metadata/3.2/Android.bp +++ b/camera/metadata/3.2/Android.bp @@ -37,6 +37,7 @@ cc_library_shared { generated_sources: ["android.hardware.camera.metadata@3.2_genc++"], generated_headers: ["android.hardware.camera.metadata@3.2_genc++_headers"], export_generated_headers: ["android.hardware.camera.metadata@3.2_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/camera/provider/2.4/Android.bp b/camera/provider/2.4/Android.bp index d295f3e0b..02e02eba4 100644 --- a/camera/provider/2.4/Android.bp +++ b/camera/provider/2.4/Android.bp @@ -47,6 +47,7 @@ cc_library_shared { generated_sources: ["android.hardware.camera.provider@2.4_genc++"], generated_headers: ["android.hardware.camera.provider@2.4_genc++_headers"], export_generated_headers: ["android.hardware.camera.provider@2.4_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/contexthub/1.0/Android.bp b/contexthub/1.0/Android.bp index 2bf951aa0..a4c7175f4 100644 --- a/contexthub/1.0/Android.bp +++ b/contexthub/1.0/Android.bp @@ -51,6 +51,7 @@ cc_library_shared { generated_sources: ["android.hardware.contexthub@1.0_genc++"], generated_headers: ["android.hardware.contexthub@1.0_genc++_headers"], export_generated_headers: ["android.hardware.contexthub@1.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/drm/1.0/Android.bp b/drm/1.0/Android.bp index 9fddaa808..0ca47663e 100644 --- a/drm/1.0/Android.bp +++ b/drm/1.0/Android.bp @@ -72,6 +72,7 @@ cc_library_shared { generated_sources: ["android.hardware.drm@1.0_genc++"], generated_headers: ["android.hardware.drm@1.0_genc++_headers"], export_generated_headers: ["android.hardware.drm@1.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/dumpstate/1.0/Android.bp b/dumpstate/1.0/Android.bp index 1b473bc68..df028b49a 100644 --- a/dumpstate/1.0/Android.bp +++ b/dumpstate/1.0/Android.bp @@ -40,6 +40,7 @@ cc_library_shared { generated_sources: ["android.hardware.dumpstate@1.0_genc++"], generated_headers: ["android.hardware.dumpstate@1.0_genc++_headers"], export_generated_headers: ["android.hardware.dumpstate@1.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/gatekeeper/1.0/Android.bp b/gatekeeper/1.0/Android.bp index 56e19db36..eddf0e50d 100644 --- a/gatekeeper/1.0/Android.bp +++ b/gatekeeper/1.0/Android.bp @@ -44,6 +44,7 @@ cc_library_shared { generated_sources: ["android.hardware.gatekeeper@1.0_genc++"], generated_headers: ["android.hardware.gatekeeper@1.0_genc++_headers"], export_generated_headers: ["android.hardware.gatekeeper@1.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/gnss/1.0/Android.bp b/gnss/1.0/Android.bp index ed6659d2e..42f35b822 100644 --- a/gnss/1.0/Android.bp +++ b/gnss/1.0/Android.bp @@ -177,6 +177,7 @@ cc_library_shared { generated_sources: ["android.hardware.gnss@1.0_genc++"], generated_headers: ["android.hardware.gnss@1.0_genc++_headers"], export_generated_headers: ["android.hardware.gnss@1.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/graphics/allocator/2.0/Android.bp b/graphics/allocator/2.0/Android.bp index f707468d2..77a3f7013 100644 --- a/graphics/allocator/2.0/Android.bp +++ b/graphics/allocator/2.0/Android.bp @@ -40,6 +40,7 @@ cc_library_shared { generated_sources: ["android.hardware.graphics.allocator@2.0_genc++"], generated_headers: ["android.hardware.graphics.allocator@2.0_genc++_headers"], export_generated_headers: ["android.hardware.graphics.allocator@2.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/graphics/bufferqueue/1.0/Android.bp b/graphics/bufferqueue/1.0/Android.bp index 4ba764f48..e7adee690 100644 --- a/graphics/bufferqueue/1.0/Android.bp +++ b/graphics/bufferqueue/1.0/Android.bp @@ -47,6 +47,7 @@ cc_library_shared { generated_sources: ["android.hardware.graphics.bufferqueue@1.0_genc++"], generated_headers: ["android.hardware.graphics.bufferqueue@1.0_genc++_headers"], export_generated_headers: ["android.hardware.graphics.bufferqueue@1.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/graphics/common/1.0/Android.bp b/graphics/common/1.0/Android.bp index 25995cd5e..69c884416 100644 --- a/graphics/common/1.0/Android.bp +++ b/graphics/common/1.0/Android.bp @@ -37,6 +37,7 @@ cc_library_shared { generated_sources: ["android.hardware.graphics.common@1.0_genc++"], generated_headers: ["android.hardware.graphics.common@1.0_genc++_headers"], export_generated_headers: ["android.hardware.graphics.common@1.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/graphics/composer/2.1/Android.bp b/graphics/composer/2.1/Android.bp index f5ab96527..a3d76d53e 100644 --- a/graphics/composer/2.1/Android.bp +++ b/graphics/composer/2.1/Android.bp @@ -58,6 +58,7 @@ cc_library_shared { generated_sources: ["android.hardware.graphics.composer@2.1_genc++"], generated_headers: ["android.hardware.graphics.composer@2.1_genc++_headers"], export_generated_headers: ["android.hardware.graphics.composer@2.1_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/graphics/mapper/2.0/Android.bp b/graphics/mapper/2.0/Android.bp index cc2bd73c8..b95c54d6c 100644 --- a/graphics/mapper/2.0/Android.bp +++ b/graphics/mapper/2.0/Android.bp @@ -44,6 +44,7 @@ cc_library_shared { generated_sources: ["android.hardware.graphics.mapper@2.0_genc++"], generated_headers: ["android.hardware.graphics.mapper@2.0_genc++_headers"], export_generated_headers: ["android.hardware.graphics.mapper@2.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/health/1.0/Android.bp b/health/1.0/Android.bp index 61f464d32..16ee7e95e 100644 --- a/health/1.0/Android.bp +++ b/health/1.0/Android.bp @@ -44,6 +44,7 @@ cc_library_shared { generated_sources: ["android.hardware.health@1.0_genc++"], generated_headers: ["android.hardware.health@1.0_genc++_headers"], export_generated_headers: ["android.hardware.health@1.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/keymaster/3.0/Android.bp b/keymaster/3.0/Android.bp index 2b0899d0b..0afee9917 100644 --- a/keymaster/3.0/Android.bp +++ b/keymaster/3.0/Android.bp @@ -44,6 +44,7 @@ cc_library_shared { generated_sources: ["android.hardware.keymaster@3.0_genc++"], generated_headers: ["android.hardware.keymaster@3.0_genc++_headers"], export_generated_headers: ["android.hardware.keymaster@3.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/light/2.0/Android.bp b/light/2.0/Android.bp index b43b7b391..b830ef057 100644 --- a/light/2.0/Android.bp +++ b/light/2.0/Android.bp @@ -44,6 +44,7 @@ cc_library_shared { generated_sources: ["android.hardware.light@2.0_genc++"], generated_headers: ["android.hardware.light@2.0_genc++_headers"], export_generated_headers: ["android.hardware.light@2.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/media/1.0/Android.bp b/media/1.0/Android.bp index 21185dbf6..04a368351 100644 --- a/media/1.0/Android.bp +++ b/media/1.0/Android.bp @@ -37,6 +37,7 @@ cc_library_shared { generated_sources: ["android.hardware.media@1.0_genc++"], generated_headers: ["android.hardware.media@1.0_genc++_headers"], export_generated_headers: ["android.hardware.media@1.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/media/omx/1.0/Android.bp b/media/omx/1.0/Android.bp index c6e03890f..b09f50c7a 100644 --- a/media/omx/1.0/Android.bp +++ b/media/omx/1.0/Android.bp @@ -72,6 +72,7 @@ cc_library_shared { generated_sources: ["android.hardware.media.omx@1.0_genc++"], generated_headers: ["android.hardware.media.omx@1.0_genc++_headers"], export_generated_headers: ["android.hardware.media.omx@1.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/memtrack/1.0/Android.bp b/memtrack/1.0/Android.bp index 4f1346341..4a4e179d7 100644 --- a/memtrack/1.0/Android.bp +++ b/memtrack/1.0/Android.bp @@ -44,6 +44,7 @@ cc_library_shared { generated_sources: ["android.hardware.memtrack@1.0_genc++"], generated_headers: ["android.hardware.memtrack@1.0_genc++_headers"], export_generated_headers: ["android.hardware.memtrack@1.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/power/1.0/Android.bp b/power/1.0/Android.bp index f9d18c889..5958b12bf 100644 --- a/power/1.0/Android.bp +++ b/power/1.0/Android.bp @@ -44,6 +44,7 @@ cc_library_shared { generated_sources: ["android.hardware.power@1.0_genc++"], generated_headers: ["android.hardware.power@1.0_genc++_headers"], export_generated_headers: ["android.hardware.power@1.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/sensors/1.0/Android.bp b/sensors/1.0/Android.bp index 9f7895da4..043e13917 100644 --- a/sensors/1.0/Android.bp +++ b/sensors/1.0/Android.bp @@ -44,6 +44,7 @@ cc_library_shared { generated_sources: ["android.hardware.sensors@1.0_genc++"], generated_headers: ["android.hardware.sensors@1.0_genc++_headers"], export_generated_headers: ["android.hardware.sensors@1.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/soundtrigger/2.0/Android.bp b/soundtrigger/2.0/Android.bp index d2a04be52..742311d26 100644 --- a/soundtrigger/2.0/Android.bp +++ b/soundtrigger/2.0/Android.bp @@ -51,6 +51,7 @@ cc_library_shared { generated_sources: ["android.hardware.soundtrigger@2.0_genc++"], generated_headers: ["android.hardware.soundtrigger@2.0_genc++_headers"], export_generated_headers: ["android.hardware.soundtrigger@2.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/tests/extension/light/2.0/Android.bp b/tests/extension/light/2.0/Android.bp index 93f9da16e..14403b6d1 100644 --- a/tests/extension/light/2.0/Android.bp +++ b/tests/extension/light/2.0/Android.bp @@ -44,6 +44,7 @@ cc_library_shared { generated_sources: ["android.hardware.tests.extension.light@2.0_genc++"], 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, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/thermal/1.0/Android.bp b/thermal/1.0/Android.bp index d7d518422..41f5ab8c8 100644 --- a/thermal/1.0/Android.bp +++ b/thermal/1.0/Android.bp @@ -44,6 +44,7 @@ cc_library_shared { generated_sources: ["android.hardware.thermal@1.0_genc++"], generated_headers: ["android.hardware.thermal@1.0_genc++_headers"], export_generated_headers: ["android.hardware.thermal@1.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/tv/cec/1.0/Android.bp b/tv/cec/1.0/Android.bp index a5d7b86ec..3f8973d11 100644 --- a/tv/cec/1.0/Android.bp +++ b/tv/cec/1.0/Android.bp @@ -51,6 +51,7 @@ cc_library_shared { generated_sources: ["android.hardware.tv.cec@1.0_genc++"], generated_headers: ["android.hardware.tv.cec@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tv.cec@1.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/tv/input/1.0/Android.bp b/tv/input/1.0/Android.bp index e9c2d63f8..65a7b027c 100644 --- a/tv/input/1.0/Android.bp +++ b/tv/input/1.0/Android.bp @@ -51,6 +51,7 @@ cc_library_shared { generated_sources: ["android.hardware.tv.input@1.0_genc++"], generated_headers: ["android.hardware.tv.input@1.0_genc++_headers"], export_generated_headers: ["android.hardware.tv.input@1.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/usb/1.0/Android.bp b/usb/1.0/Android.bp index f939c8ba4..11856a0f3 100644 --- a/usb/1.0/Android.bp +++ b/usb/1.0/Android.bp @@ -51,6 +51,7 @@ cc_library_shared { generated_sources: ["android.hardware.usb@1.0_genc++"], generated_headers: ["android.hardware.usb@1.0_genc++_headers"], export_generated_headers: ["android.hardware.usb@1.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/vibrator/1.0/Android.bp b/vibrator/1.0/Android.bp index 11ae9967a..204ff5033 100644 --- a/vibrator/1.0/Android.bp +++ b/vibrator/1.0/Android.bp @@ -44,6 +44,7 @@ cc_library_shared { generated_sources: ["android.hardware.vibrator@1.0_genc++"], generated_headers: ["android.hardware.vibrator@1.0_genc++_headers"], export_generated_headers: ["android.hardware.vibrator@1.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", diff --git a/vibrator/1.0/Android.mk b/vibrator/1.0/Android.mk index d921a7e9e..8de1ac31f 100644 --- a/vibrator/1.0/Android.mk +++ b/vibrator/1.0/Android.mk @@ -36,6 +36,25 @@ $(GEN): $(LOCAL_PATH)/types.hal LOCAL_GENERATED_SOURCES += $(GEN) # +# Build types.hal (EffectStrength) +# +GEN := $(intermediates)/android/hardware/vibrator/V1_0/EffectStrength.java +$(GEN): $(HIDL) +$(GEN): PRIVATE_HIDL := $(HIDL) +$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal +$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) +$(GEN): PRIVATE_CUSTOM_TOOL = \ + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava \ + -randroid.hardware:hardware/interfaces \ + -randroid.hidl:system/libhidl/transport \ + android.hardware.vibrator@1.0::types.EffectStrength + +$(GEN): $(LOCAL_PATH)/types.hal + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) + +# # Build types.hal (Status) # GEN := $(intermediates)/android/hardware/vibrator/V1_0/Status.java @@ -111,6 +130,25 @@ $(GEN): $(LOCAL_PATH)/types.hal LOCAL_GENERATED_SOURCES += $(GEN) # +# Build types.hal (EffectStrength) +# +GEN := $(intermediates)/android/hardware/vibrator/V1_0/EffectStrength.java +$(GEN): $(HIDL) +$(GEN): PRIVATE_HIDL := $(HIDL) +$(GEN): PRIVATE_DEPS := $(LOCAL_PATH)/types.hal +$(GEN): PRIVATE_OUTPUT_DIR := $(intermediates) +$(GEN): PRIVATE_CUSTOM_TOOL = \ + $(PRIVATE_HIDL) -o $(PRIVATE_OUTPUT_DIR) \ + -Ljava \ + -randroid.hardware:hardware/interfaces \ + -randroid.hidl:system/libhidl/transport \ + android.hardware.vibrator@1.0::types.EffectStrength + +$(GEN): $(LOCAL_PATH)/types.hal + $(transform-generated-source) +LOCAL_GENERATED_SOURCES += $(GEN) + +# # Build types.hal (Status) # GEN := $(intermediates)/android/hardware/vibrator/V1_0/Status.java @@ -158,7 +196,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := android.hardware.vibrator@1.0-java-constants LOCAL_MODULE_CLASS := JAVA_LIBRARIES -intermediates := $(local-generated-sources-dir) +intermediates := $(call local-generated-sources-dir, COMMON) HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) # diff --git a/vr/1.0/Android.bp b/vr/1.0/Android.bp index b48d01014..66c346eaf 100644 --- a/vr/1.0/Android.bp +++ b/vr/1.0/Android.bp @@ -40,6 +40,7 @@ cc_library_shared { generated_sources: ["android.hardware.vr@1.0_genc++"], generated_headers: ["android.hardware.vr@1.0_genc++_headers"], export_generated_headers: ["android.hardware.vr@1.0_genc++_headers"], + vendor_available: true, shared_libs: [ "libhidlbase", "libhidltransport", |