From 561b602a9984624c8459bbd3d7b8bd74853fc18d Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 27 Mar 2017 11:48:14 -0700 Subject: [PATCH] Update makefiles for hwtypes.h Test: pass Change-Id: I8e17eb8fec5d2f04c526476a866c8dd54ccb556c --- audio/2.0/Android.bp | 1 + audio/common/2.0/Android.bp | 1 + audio/effect/2.0/Android.bp | 1 + automotive/evs/1.0/Android.bp | 1 + automotive/vehicle/2.0/Android.bp | 1 + automotive/vehicle/2.1/Android.bp | 1 + biometrics/fingerprint/2.1/Android.bp | 1 + broadcastradio/1.0/Android.bp | 1 + broadcastradio/1.1/Android.bp | 1 + camera/common/1.0/Android.bp | 1 + camera/device/1.0/Android.bp | 1 + camera/device/3.2/Android.bp | 1 + camera/metadata/3.2/Android.bp | 1 + contexthub/1.0/Android.bp | 1 + drm/1.0/Android.bp | 1 + gatekeeper/1.0/Android.bp | 1 + gnss/1.0/Android.bp | 1 + graphics/allocator/2.0/Android.bp | 1 + graphics/common/1.0/Android.bp | 1 + graphics/composer/2.1/Android.bp | 1 + graphics/mapper/2.0/Android.bp | 1 + health/1.0/Android.bp | 1 + keymaster/3.0/Android.bp | 1 + light/2.0/Android.bp | 1 + media/1.0/Android.bp | 1 + media/omx/1.0/Android.bp | 1 + memtrack/1.0/Android.bp | 1 + power/1.0/Android.bp | 1 + sensors/1.0/Android.bp | 1 + soundtrigger/2.0/Android.bp | 1 + tests/extension/light/2.0/Android.bp | 1 + thermal/1.0/Android.bp | 1 + tv/cec/1.0/Android.bp | 1 + tv/input/1.0/Android.bp | 1 + usb/1.0/Android.bp | 1 + vibrator/1.0/Android.bp | 1 + 36 files changed, 36 insertions(+) diff --git a/audio/2.0/Android.bp b/audio/2.0/Android.bp index 69ff7919f1..f7975eca35 100644 --- a/audio/2.0/Android.bp +++ b/audio/2.0/Android.bp @@ -42,6 +42,7 @@ genrule { ], out: [ "android/hardware/audio/2.0/types.h", + "android/hardware/audio/2.0/hwtypes.h", "android/hardware/audio/2.0/IDevice.h", "android/hardware/audio/2.0/IHwDevice.h", "android/hardware/audio/2.0/BnHwDevice.h", diff --git a/audio/common/2.0/Android.bp b/audio/common/2.0/Android.bp index 533008649d..ad599edf41 100644 --- a/audio/common/2.0/Android.bp +++ b/audio/common/2.0/Android.bp @@ -28,6 +28,7 @@ genrule { ], out: [ "android/hardware/audio/common/2.0/types.h", + "android/hardware/audio/common/2.0/hwtypes.h", ], } diff --git a/audio/effect/2.0/Android.bp b/audio/effect/2.0/Android.bp index 83a702a05b..937a4e62ff 100644 --- a/audio/effect/2.0/Android.bp +++ b/audio/effect/2.0/Android.bp @@ -56,6 +56,7 @@ genrule { ], out: [ "android/hardware/audio/effect/2.0/types.h", + "android/hardware/audio/effect/2.0/hwtypes.h", "android/hardware/audio/effect/2.0/IAcousticEchoCancelerEffect.h", "android/hardware/audio/effect/2.0/IHwAcousticEchoCancelerEffect.h", "android/hardware/audio/effect/2.0/BnHwAcousticEchoCancelerEffect.h", diff --git a/automotive/evs/1.0/Android.bp b/automotive/evs/1.0/Android.bp index 042becd730..ec56c8fe42 100644 --- a/automotive/evs/1.0/Android.bp +++ b/automotive/evs/1.0/Android.bp @@ -36,6 +36,7 @@ genrule { ], out: [ "android/hardware/automotive/evs/1.0/types.h", + "android/hardware/automotive/evs/1.0/hwtypes.h", "android/hardware/automotive/evs/1.0/IEvsCamera.h", "android/hardware/automotive/evs/1.0/IHwEvsCamera.h", "android/hardware/automotive/evs/1.0/BnHwEvsCamera.h", diff --git a/automotive/vehicle/2.0/Android.bp b/automotive/vehicle/2.0/Android.bp index e08d3ca627..6957bf8017 100644 --- a/automotive/vehicle/2.0/Android.bp +++ b/automotive/vehicle/2.0/Android.bp @@ -32,6 +32,7 @@ genrule { ], out: [ "android/hardware/automotive/vehicle/2.0/types.h", + "android/hardware/automotive/vehicle/2.0/hwtypes.h", "android/hardware/automotive/vehicle/2.0/IVehicle.h", "android/hardware/automotive/vehicle/2.0/IHwVehicle.h", "android/hardware/automotive/vehicle/2.0/BnHwVehicle.h", diff --git a/automotive/vehicle/2.1/Android.bp b/automotive/vehicle/2.1/Android.bp index cf4d8b0385..825ec1f665 100644 --- a/automotive/vehicle/2.1/Android.bp +++ b/automotive/vehicle/2.1/Android.bp @@ -30,6 +30,7 @@ genrule { ], out: [ "android/hardware/automotive/vehicle/2.1/types.h", + "android/hardware/automotive/vehicle/2.1/hwtypes.h", "android/hardware/automotive/vehicle/2.1/IVehicle.h", "android/hardware/automotive/vehicle/2.1/IHwVehicle.h", "android/hardware/automotive/vehicle/2.1/BnHwVehicle.h", diff --git a/biometrics/fingerprint/2.1/Android.bp b/biometrics/fingerprint/2.1/Android.bp index 586e1b3de7..e928f9bbcd 100644 --- a/biometrics/fingerprint/2.1/Android.bp +++ b/biometrics/fingerprint/2.1/Android.bp @@ -32,6 +32,7 @@ genrule { ], out: [ "android/hardware/biometrics/fingerprint/2.1/types.h", + "android/hardware/biometrics/fingerprint/2.1/hwtypes.h", "android/hardware/biometrics/fingerprint/2.1/IBiometricsFingerprint.h", "android/hardware/biometrics/fingerprint/2.1/IHwBiometricsFingerprint.h", "android/hardware/biometrics/fingerprint/2.1/BnHwBiometricsFingerprint.h", diff --git a/broadcastradio/1.0/Android.bp b/broadcastradio/1.0/Android.bp index 3c3a0150cc..5f507481a8 100644 --- a/broadcastradio/1.0/Android.bp +++ b/broadcastradio/1.0/Android.bp @@ -36,6 +36,7 @@ genrule { ], out: [ "android/hardware/broadcastradio/1.0/types.h", + "android/hardware/broadcastradio/1.0/hwtypes.h", "android/hardware/broadcastradio/1.0/IBroadcastRadio.h", "android/hardware/broadcastradio/1.0/IHwBroadcastRadio.h", "android/hardware/broadcastradio/1.0/BnHwBroadcastRadio.h", diff --git a/broadcastradio/1.1/Android.bp b/broadcastradio/1.1/Android.bp index 12611dd12d..cc0747a423 100644 --- a/broadcastradio/1.1/Android.bp +++ b/broadcastradio/1.1/Android.bp @@ -36,6 +36,7 @@ genrule { ], out: [ "android/hardware/broadcastradio/1.1/types.h", + "android/hardware/broadcastradio/1.1/hwtypes.h", "android/hardware/broadcastradio/1.1/IBroadcastRadio.h", "android/hardware/broadcastradio/1.1/IHwBroadcastRadio.h", "android/hardware/broadcastradio/1.1/BnHwBroadcastRadio.h", diff --git a/camera/common/1.0/Android.bp b/camera/common/1.0/Android.bp index aea6e76365..80b5e54af8 100644 --- a/camera/common/1.0/Android.bp +++ b/camera/common/1.0/Android.bp @@ -28,6 +28,7 @@ genrule { ], out: [ "android/hardware/camera/common/1.0/types.h", + "android/hardware/camera/common/1.0/hwtypes.h", ], } diff --git a/camera/device/1.0/Android.bp b/camera/device/1.0/Android.bp index b8560c777a..44a108ce29 100644 --- a/camera/device/1.0/Android.bp +++ b/camera/device/1.0/Android.bp @@ -34,6 +34,7 @@ genrule { ], out: [ "android/hardware/camera/device/1.0/types.h", + "android/hardware/camera/device/1.0/hwtypes.h", "android/hardware/camera/device/1.0/ICameraDevice.h", "android/hardware/camera/device/1.0/IHwCameraDevice.h", "android/hardware/camera/device/1.0/BnHwCameraDevice.h", diff --git a/camera/device/3.2/Android.bp b/camera/device/3.2/Android.bp index a3ac721c31..fd7276f946 100644 --- a/camera/device/3.2/Android.bp +++ b/camera/device/3.2/Android.bp @@ -34,6 +34,7 @@ genrule { ], out: [ "android/hardware/camera/device/3.2/types.h", + "android/hardware/camera/device/3.2/hwtypes.h", "android/hardware/camera/device/3.2/ICameraDevice.h", "android/hardware/camera/device/3.2/IHwCameraDevice.h", "android/hardware/camera/device/3.2/BnHwCameraDevice.h", diff --git a/camera/metadata/3.2/Android.bp b/camera/metadata/3.2/Android.bp index 1e464d61c8..d6bb9a36b9 100644 --- a/camera/metadata/3.2/Android.bp +++ b/camera/metadata/3.2/Android.bp @@ -28,6 +28,7 @@ genrule { ], out: [ "android/hardware/camera/metadata/3.2/types.h", + "android/hardware/camera/metadata/3.2/hwtypes.h", ], } diff --git a/contexthub/1.0/Android.bp b/contexthub/1.0/Android.bp index 8cd4acb061..2bf951aa06 100644 --- a/contexthub/1.0/Android.bp +++ b/contexthub/1.0/Android.bp @@ -32,6 +32,7 @@ genrule { ], out: [ "android/hardware/contexthub/1.0/types.h", + "android/hardware/contexthub/1.0/hwtypes.h", "android/hardware/contexthub/1.0/IContexthub.h", "android/hardware/contexthub/1.0/IHwContexthub.h", "android/hardware/contexthub/1.0/BnHwContexthub.h", diff --git a/drm/1.0/Android.bp b/drm/1.0/Android.bp index 0241984b72..9fddaa8081 100644 --- a/drm/1.0/Android.bp +++ b/drm/1.0/Android.bp @@ -38,6 +38,7 @@ genrule { ], out: [ "android/hardware/drm/1.0/types.h", + "android/hardware/drm/1.0/hwtypes.h", "android/hardware/drm/1.0/ICryptoFactory.h", "android/hardware/drm/1.0/IHwCryptoFactory.h", "android/hardware/drm/1.0/BnHwCryptoFactory.h", diff --git a/gatekeeper/1.0/Android.bp b/gatekeeper/1.0/Android.bp index 2697e4c9bf..56e19db36d 100644 --- a/gatekeeper/1.0/Android.bp +++ b/gatekeeper/1.0/Android.bp @@ -30,6 +30,7 @@ genrule { ], out: [ "android/hardware/gatekeeper/1.0/types.h", + "android/hardware/gatekeeper/1.0/hwtypes.h", "android/hardware/gatekeeper/1.0/IGatekeeper.h", "android/hardware/gatekeeper/1.0/IHwGatekeeper.h", "android/hardware/gatekeeper/1.0/BnHwGatekeeper.h", diff --git a/gnss/1.0/Android.bp b/gnss/1.0/Android.bp index 16895b67a3..ed6659d2e3 100644 --- a/gnss/1.0/Android.bp +++ b/gnss/1.0/Android.bp @@ -68,6 +68,7 @@ genrule { ], out: [ "android/hardware/gnss/1.0/types.h", + "android/hardware/gnss/1.0/hwtypes.h", "android/hardware/gnss/1.0/IAGnss.h", "android/hardware/gnss/1.0/IHwAGnss.h", "android/hardware/gnss/1.0/BnHwAGnss.h", diff --git a/graphics/allocator/2.0/Android.bp b/graphics/allocator/2.0/Android.bp index 69ddd9b82a..271f2cecbc 100644 --- a/graphics/allocator/2.0/Android.bp +++ b/graphics/allocator/2.0/Android.bp @@ -32,6 +32,7 @@ genrule { ], out: [ "android/hardware/graphics/allocator/2.0/types.h", + "android/hardware/graphics/allocator/2.0/hwtypes.h", "android/hardware/graphics/allocator/2.0/IAllocator.h", "android/hardware/graphics/allocator/2.0/IHwAllocator.h", "android/hardware/graphics/allocator/2.0/BnHwAllocator.h", diff --git a/graphics/common/1.0/Android.bp b/graphics/common/1.0/Android.bp index 99370e8add..25995cd5e7 100644 --- a/graphics/common/1.0/Android.bp +++ b/graphics/common/1.0/Android.bp @@ -28,6 +28,7 @@ genrule { ], out: [ "android/hardware/graphics/common/1.0/types.h", + "android/hardware/graphics/common/1.0/hwtypes.h", ], } diff --git a/graphics/composer/2.1/Android.bp b/graphics/composer/2.1/Android.bp index f309439dc7..f5ab965274 100644 --- a/graphics/composer/2.1/Android.bp +++ b/graphics/composer/2.1/Android.bp @@ -34,6 +34,7 @@ genrule { ], out: [ "android/hardware/graphics/composer/2.1/types.h", + "android/hardware/graphics/composer/2.1/hwtypes.h", "android/hardware/graphics/composer/2.1/IComposer.h", "android/hardware/graphics/composer/2.1/IHwComposer.h", "android/hardware/graphics/composer/2.1/BnHwComposer.h", diff --git a/graphics/mapper/2.0/Android.bp b/graphics/mapper/2.0/Android.bp index b835b4a2c6..98a509bb5a 100644 --- a/graphics/mapper/2.0/Android.bp +++ b/graphics/mapper/2.0/Android.bp @@ -30,6 +30,7 @@ genrule { ], out: [ "android/hardware/graphics/mapper/2.0/types.h", + "android/hardware/graphics/mapper/2.0/hwtypes.h", "android/hardware/graphics/mapper/2.0/IMapper.h", "android/hardware/graphics/mapper/2.0/IHwMapper.h", "android/hardware/graphics/mapper/2.0/BnHwMapper.h", diff --git a/health/1.0/Android.bp b/health/1.0/Android.bp index a428c7d0e5..61f464d326 100644 --- a/health/1.0/Android.bp +++ b/health/1.0/Android.bp @@ -30,6 +30,7 @@ genrule { ], out: [ "android/hardware/health/1.0/types.h", + "android/hardware/health/1.0/hwtypes.h", "android/hardware/health/1.0/IHealth.h", "android/hardware/health/1.0/IHwHealth.h", "android/hardware/health/1.0/BnHwHealth.h", diff --git a/keymaster/3.0/Android.bp b/keymaster/3.0/Android.bp index 074bb682e9..2b0899d0b8 100644 --- a/keymaster/3.0/Android.bp +++ b/keymaster/3.0/Android.bp @@ -30,6 +30,7 @@ genrule { ], out: [ "android/hardware/keymaster/3.0/types.h", + "android/hardware/keymaster/3.0/hwtypes.h", "android/hardware/keymaster/3.0/IKeymasterDevice.h", "android/hardware/keymaster/3.0/IHwKeymasterDevice.h", "android/hardware/keymaster/3.0/BnHwKeymasterDevice.h", diff --git a/light/2.0/Android.bp b/light/2.0/Android.bp index 093a9f332c..b43b7b3918 100644 --- a/light/2.0/Android.bp +++ b/light/2.0/Android.bp @@ -30,6 +30,7 @@ genrule { ], out: [ "android/hardware/light/2.0/types.h", + "android/hardware/light/2.0/hwtypes.h", "android/hardware/light/2.0/ILight.h", "android/hardware/light/2.0/IHwLight.h", "android/hardware/light/2.0/BnHwLight.h", diff --git a/media/1.0/Android.bp b/media/1.0/Android.bp index 7518eb3f94..21185dbf64 100644 --- a/media/1.0/Android.bp +++ b/media/1.0/Android.bp @@ -28,6 +28,7 @@ genrule { ], out: [ "android/hardware/media/1.0/types.h", + "android/hardware/media/1.0/hwtypes.h", ], } diff --git a/media/omx/1.0/Android.bp b/media/omx/1.0/Android.bp index 81dd617b6d..c6e03890fc 100644 --- a/media/omx/1.0/Android.bp +++ b/media/omx/1.0/Android.bp @@ -38,6 +38,7 @@ genrule { ], out: [ "android/hardware/media/omx/1.0/types.h", + "android/hardware/media/omx/1.0/hwtypes.h", "android/hardware/media/omx/1.0/IGraphicBufferSource.h", "android/hardware/media/omx/1.0/IHwGraphicBufferSource.h", "android/hardware/media/omx/1.0/BnHwGraphicBufferSource.h", diff --git a/memtrack/1.0/Android.bp b/memtrack/1.0/Android.bp index 9f4c7f66ed..4f13463414 100644 --- a/memtrack/1.0/Android.bp +++ b/memtrack/1.0/Android.bp @@ -30,6 +30,7 @@ genrule { ], out: [ "android/hardware/memtrack/1.0/types.h", + "android/hardware/memtrack/1.0/hwtypes.h", "android/hardware/memtrack/1.0/IMemtrack.h", "android/hardware/memtrack/1.0/IHwMemtrack.h", "android/hardware/memtrack/1.0/BnHwMemtrack.h", diff --git a/power/1.0/Android.bp b/power/1.0/Android.bp index 453d5251a2..f9d18c8891 100644 --- a/power/1.0/Android.bp +++ b/power/1.0/Android.bp @@ -30,6 +30,7 @@ genrule { ], out: [ "android/hardware/power/1.0/types.h", + "android/hardware/power/1.0/hwtypes.h", "android/hardware/power/1.0/IPower.h", "android/hardware/power/1.0/IHwPower.h", "android/hardware/power/1.0/BnHwPower.h", diff --git a/sensors/1.0/Android.bp b/sensors/1.0/Android.bp index 8357dbe476..9f7895da47 100644 --- a/sensors/1.0/Android.bp +++ b/sensors/1.0/Android.bp @@ -30,6 +30,7 @@ genrule { ], out: [ "android/hardware/sensors/1.0/types.h", + "android/hardware/sensors/1.0/hwtypes.h", "android/hardware/sensors/1.0/ISensors.h", "android/hardware/sensors/1.0/IHwSensors.h", "android/hardware/sensors/1.0/BnHwSensors.h", diff --git a/soundtrigger/2.0/Android.bp b/soundtrigger/2.0/Android.bp index 4d2bb1a4f1..d2a04be521 100644 --- a/soundtrigger/2.0/Android.bp +++ b/soundtrigger/2.0/Android.bp @@ -32,6 +32,7 @@ genrule { ], out: [ "android/hardware/soundtrigger/2.0/types.h", + "android/hardware/soundtrigger/2.0/hwtypes.h", "android/hardware/soundtrigger/2.0/ISoundTriggerHw.h", "android/hardware/soundtrigger/2.0/IHwSoundTriggerHw.h", "android/hardware/soundtrigger/2.0/BnHwSoundTriggerHw.h", diff --git a/tests/extension/light/2.0/Android.bp b/tests/extension/light/2.0/Android.bp index 123bea1991..93f9da16eb 100644 --- a/tests/extension/light/2.0/Android.bp +++ b/tests/extension/light/2.0/Android.bp @@ -30,6 +30,7 @@ genrule { ], out: [ "android/hardware/tests/extension/light/2.0/types.h", + "android/hardware/tests/extension/light/2.0/hwtypes.h", "android/hardware/tests/extension/light/2.0/IExtLight.h", "android/hardware/tests/extension/light/2.0/IHwExtLight.h", "android/hardware/tests/extension/light/2.0/BnHwExtLight.h", diff --git a/thermal/1.0/Android.bp b/thermal/1.0/Android.bp index fab5533699..d7d518422b 100644 --- a/thermal/1.0/Android.bp +++ b/thermal/1.0/Android.bp @@ -30,6 +30,7 @@ genrule { ], out: [ "android/hardware/thermal/1.0/types.h", + "android/hardware/thermal/1.0/hwtypes.h", "android/hardware/thermal/1.0/IThermal.h", "android/hardware/thermal/1.0/IHwThermal.h", "android/hardware/thermal/1.0/BnHwThermal.h", diff --git a/tv/cec/1.0/Android.bp b/tv/cec/1.0/Android.bp index 5c6919dc87..a5d7b86ec1 100644 --- a/tv/cec/1.0/Android.bp +++ b/tv/cec/1.0/Android.bp @@ -32,6 +32,7 @@ genrule { ], out: [ "android/hardware/tv/cec/1.0/types.h", + "android/hardware/tv/cec/1.0/hwtypes.h", "android/hardware/tv/cec/1.0/IHdmiCec.h", "android/hardware/tv/cec/1.0/IHwHdmiCec.h", "android/hardware/tv/cec/1.0/BnHwHdmiCec.h", diff --git a/tv/input/1.0/Android.bp b/tv/input/1.0/Android.bp index ae5e3deb10..e9c2d63f82 100644 --- a/tv/input/1.0/Android.bp +++ b/tv/input/1.0/Android.bp @@ -32,6 +32,7 @@ genrule { ], out: [ "android/hardware/tv/input/1.0/types.h", + "android/hardware/tv/input/1.0/hwtypes.h", "android/hardware/tv/input/1.0/ITvInput.h", "android/hardware/tv/input/1.0/IHwTvInput.h", "android/hardware/tv/input/1.0/BnHwTvInput.h", diff --git a/usb/1.0/Android.bp b/usb/1.0/Android.bp index 0b641f1725..f939c8ba48 100644 --- a/usb/1.0/Android.bp +++ b/usb/1.0/Android.bp @@ -32,6 +32,7 @@ genrule { ], out: [ "android/hardware/usb/1.0/types.h", + "android/hardware/usb/1.0/hwtypes.h", "android/hardware/usb/1.0/IUsb.h", "android/hardware/usb/1.0/IHwUsb.h", "android/hardware/usb/1.0/BnHwUsb.h", diff --git a/vibrator/1.0/Android.bp b/vibrator/1.0/Android.bp index d6813ea0c5..11ae9967a5 100644 --- a/vibrator/1.0/Android.bp +++ b/vibrator/1.0/Android.bp @@ -30,6 +30,7 @@ genrule { ], out: [ "android/hardware/vibrator/1.0/types.h", + "android/hardware/vibrator/1.0/hwtypes.h", "android/hardware/vibrator/1.0/IVibrator.h", "android/hardware/vibrator/1.0/IHwVibrator.h", "android/hardware/vibrator/1.0/BnHwVibrator.h",