diff options
author | Steven Moreland <smoreland@google.com> | 2017-11-13 09:20:49 -0800 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2017-12-03 10:31:49 -0800 |
commit | 4e1e4081e41e12c0ed2e61ab63b42ad6e6234a7e (patch) | |
tree | 170cd4b23ddbf6d2706687fb9887aa2c3969c3e4 /cas | |
parent | b4c725535ec4d51e0c93a254540f7fa81e148a02 (diff) | |
download | android_hardware_interfaces-4e1e4081e41e12c0ed2e61ab63b42ad6e6234a7e.tar.gz android_hardware_interfaces-4e1e4081e41e12c0ed2e61ab63b42ad6e6234a7e.tar.bz2 android_hardware_interfaces-4e1e4081e41e12c0ed2e61ab63b42ad6e6234a7e.zip |
Updating makefiles for hidl_interface.
Bug: 64487114
Test: manual
Merged-In: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
Change-Id: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
(cherry-picked from commit c2f829a1d2673f91add6bcd536c7d4fe753d0447)
Diffstat (limited to 'cas')
-rw-r--r-- | cas/1.0/Android.bp | 88 | ||||
-rw-r--r-- | cas/native/1.0/Android.bp | 76 |
2 files changed, 30 insertions, 134 deletions
diff --git a/cas/1.0/Android.bp b/cas/1.0/Android.bp index 6d94793b7..39b36beba 100644 --- a/cas/1.0/Android.bp +++ b/cas/1.0/Android.bp @@ -1,7 +1,11 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.cas@1.0_hal", +hidl_interface { + name: "android.hardware.cas@1.0", + root: "android.hardware", + vndk: { + enabled: true, + }, srcs: [ "types.hal", "ICas.hal", @@ -9,79 +13,13 @@ filegroup { "IDescramblerBase.hal", "IMediaCasService.hal", ], -} - -genrule { - name: "android.hardware.cas@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas@1.0", - srcs: [ - ":android.hardware.cas@1.0_hal", + interfaces: [ + "android.hidl.base@1.0", ], - out: [ - "android/hardware/cas/1.0/types.cpp", - "android/hardware/cas/1.0/CasAll.cpp", - "android/hardware/cas/1.0/CasListenerAll.cpp", - "android/hardware/cas/1.0/DescramblerBaseAll.cpp", - "android/hardware/cas/1.0/MediaCasServiceAll.cpp", + types: [ + "HidlCasPluginDescriptor", + "Status", ], + gen_java: true, } -genrule { - name: "android.hardware.cas@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas@1.0", - srcs: [ - ":android.hardware.cas@1.0_hal", - ], - out: [ - "android/hardware/cas/1.0/types.h", - "android/hardware/cas/1.0/hwtypes.h", - "android/hardware/cas/1.0/ICas.h", - "android/hardware/cas/1.0/IHwCas.h", - "android/hardware/cas/1.0/BnHwCas.h", - "android/hardware/cas/1.0/BpHwCas.h", - "android/hardware/cas/1.0/BsCas.h", - "android/hardware/cas/1.0/ICasListener.h", - "android/hardware/cas/1.0/IHwCasListener.h", - "android/hardware/cas/1.0/BnHwCasListener.h", - "android/hardware/cas/1.0/BpHwCasListener.h", - "android/hardware/cas/1.0/BsCasListener.h", - "android/hardware/cas/1.0/IDescramblerBase.h", - "android/hardware/cas/1.0/IHwDescramblerBase.h", - "android/hardware/cas/1.0/BnHwDescramblerBase.h", - "android/hardware/cas/1.0/BpHwDescramblerBase.h", - "android/hardware/cas/1.0/BsDescramblerBase.h", - "android/hardware/cas/1.0/IMediaCasService.h", - "android/hardware/cas/1.0/IHwMediaCasService.h", - "android/hardware/cas/1.0/BnHwMediaCasService.h", - "android/hardware/cas/1.0/BpHwMediaCasService.h", - "android/hardware/cas/1.0/BsMediaCasService.h", - ], -} - -cc_library { - name: "android.hardware.cas@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.cas@1.0_genc++"], - 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", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", - ], -} diff --git a/cas/native/1.0/Android.bp b/cas/native/1.0/Android.bp index e39cab1f7..75874161d 100644 --- a/cas/native/1.0/Android.bp +++ b/cas/native/1.0/Android.bp @@ -1,68 +1,26 @@ -// This file is autogenerated by hidl-gen. Do not edit manually. +// This file is autogenerated by hidl-gen -Landroidbp. -filegroup { - name: "android.hardware.cas.native@1.0_hal", - srcs: [ - "types.hal", - "IDescrambler.hal", - ], -} - -genrule { - name: "android.hardware.cas.native@1.0_genc++", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas.native@1.0", - srcs: [ - ":android.hardware.cas.native@1.0_hal", - ], - out: [ - "android/hardware/cas/native/1.0/types.cpp", - "android/hardware/cas/native/1.0/DescramblerAll.cpp", - ], -} - -genrule { - name: "android.hardware.cas.native@1.0_genc++_headers", - tools: ["hidl-gen"], - cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.cas.native@1.0", - srcs: [ - ":android.hardware.cas.native@1.0_hal", - ], - out: [ - "android/hardware/cas/native/1.0/types.h", - "android/hardware/cas/native/1.0/hwtypes.h", - "android/hardware/cas/native/1.0/IDescrambler.h", - "android/hardware/cas/native/1.0/IHwDescrambler.h", - "android/hardware/cas/native/1.0/BnHwDescrambler.h", - "android/hardware/cas/native/1.0/BpHwDescrambler.h", - "android/hardware/cas/native/1.0/BsDescrambler.h", - ], -} - -cc_library { +hidl_interface { name: "android.hardware.cas.native@1.0", - defaults: ["hidl-module-defaults"], - generated_sources: ["android.hardware.cas.native@1.0_genc++"], - generated_headers: ["android.hardware.cas.native@1.0_genc++_headers"], - export_generated_headers: ["android.hardware.cas.native@1.0_genc++_headers"], - vendor_available: true, + root: "android.hardware", vndk: { enabled: true, }, - shared_libs: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "liblog", - "libutils", - "libcutils", - "android.hardware.cas@1.0", + srcs: [ + "types.hal", + "IDescrambler.hal", ], - export_shared_lib_headers: [ - "libhidlbase", - "libhidltransport", - "libhwbinder", - "libutils", + interfaces: [ "android.hardware.cas@1.0", + "android.hidl.base@1.0", ], + types: [ + "BufferType", + "DestinationBuffer", + "ScramblingControl", + "SharedBuffer", + "SubSample", + ], + gen_java: false, } + |