Updating makefiles for hidl_interface.
Bug: 64487114
Test: manual
Merged-In: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
Change-Id: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
diff --git a/drm/1.0/Android.bp b/drm/1.0/Android.bp
index eb26e86..aca5ae4 100644
--- a/drm/1.0/Android.bp
+++ b/drm/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.drm@1.0_hal",
+hidl_interface {
+ name: "android.hardware.drm@1.0",
+ root: "android.hardware",
+ vndk: {
+ enabled: true,
+ },
srcs: [
"types.hal",
"ICryptoFactory.hal",
@@ -10,172 +14,25 @@
"IDrmPlugin.hal",
"IDrmPluginListener.hal",
],
+ interfaces: [
+ "android.hidl.base@1.0",
+ ],
+ types: [
+ "BufferType",
+ "DestinationBuffer",
+ "EventType",
+ "KeyRequestType",
+ "KeyStatus",
+ "KeyStatusType",
+ "KeyType",
+ "KeyValue",
+ "Mode",
+ "Pattern",
+ "SecureStop",
+ "SharedBuffer",
+ "Status",
+ "SubSample",
+ ],
+ gen_java: false,
}
-genrule {
- name: "android.hardware.drm@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.drm@1.0",
- srcs: [
- ":android.hardware.drm@1.0_hal",
- ],
- out: [
- "android/hardware/drm/1.0/types.cpp",
- "android/hardware/drm/1.0/CryptoFactoryAll.cpp",
- "android/hardware/drm/1.0/CryptoPluginAll.cpp",
- "android/hardware/drm/1.0/DrmFactoryAll.cpp",
- "android/hardware/drm/1.0/DrmPluginAll.cpp",
- "android/hardware/drm/1.0/DrmPluginListenerAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.drm@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.drm@1.0",
- srcs: [
- ":android.hardware.drm@1.0_hal",
- ],
- 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",
- "android/hardware/drm/1.0/BpHwCryptoFactory.h",
- "android/hardware/drm/1.0/BsCryptoFactory.h",
- "android/hardware/drm/1.0/ICryptoPlugin.h",
- "android/hardware/drm/1.0/IHwCryptoPlugin.h",
- "android/hardware/drm/1.0/BnHwCryptoPlugin.h",
- "android/hardware/drm/1.0/BpHwCryptoPlugin.h",
- "android/hardware/drm/1.0/BsCryptoPlugin.h",
- "android/hardware/drm/1.0/IDrmFactory.h",
- "android/hardware/drm/1.0/IHwDrmFactory.h",
- "android/hardware/drm/1.0/BnHwDrmFactory.h",
- "android/hardware/drm/1.0/BpHwDrmFactory.h",
- "android/hardware/drm/1.0/BsDrmFactory.h",
- "android/hardware/drm/1.0/IDrmPlugin.h",
- "android/hardware/drm/1.0/IHwDrmPlugin.h",
- "android/hardware/drm/1.0/BnHwDrmPlugin.h",
- "android/hardware/drm/1.0/BpHwDrmPlugin.h",
- "android/hardware/drm/1.0/BsDrmPlugin.h",
- "android/hardware/drm/1.0/IDrmPluginListener.h",
- "android/hardware/drm/1.0/IHwDrmPluginListener.h",
- "android/hardware/drm/1.0/BnHwDrmPluginListener.h",
- "android/hardware/drm/1.0/BpHwDrmPluginListener.h",
- "android/hardware/drm/1.0/BsDrmPluginListener.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.drm@1.0",
- defaults: ["hidl-module-defaults"],
- 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,
- vndk: {
- enabled: true,
- },
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- ],
-}
-
-// This package is not java compatible. Not creating java target.
-
-// This package does not export any types. Not creating java constants export.
-
-
-genrule {
- name: "android.hardware.drm@1.0-adapter-helper_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0",
- srcs: [
- ":android.hardware.drm@1.0_hal",
- ],
- out: [
- "android/hardware/drm/1.0/ACryptoFactory.cpp",
- "android/hardware/drm/1.0/ACryptoPlugin.cpp",
- "android/hardware/drm/1.0/ADrmFactory.cpp",
- "android/hardware/drm/1.0/ADrmPlugin.cpp",
- "android/hardware/drm/1.0/ADrmPluginListener.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.drm@1.0-adapter-helper_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0",
- srcs: [
- ":android.hardware.drm@1.0_hal",
- ],
- out: [
- "android/hardware/drm/1.0/ACryptoFactory.h",
- "android/hardware/drm/1.0/ACryptoPlugin.h",
- "android/hardware/drm/1.0/ADrmFactory.h",
- "android/hardware/drm/1.0/ADrmPlugin.h",
- "android/hardware/drm/1.0/ADrmPluginListener.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.drm@1.0-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.drm@1.0-adapter-helper_genc++"],
- generated_headers: ["android.hardware.drm@1.0-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.hardware.drm@1.0-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.hardware.drm@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.hardware.drm@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.hardware.drm@1.0-adapter_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-adapter-main -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.drm@1.0",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.hardware.drm@1.0-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.hardware.drm@1.0",
- "android.hardware.drm@1.0-adapter-helper",
- ],
- generated_sources: ["android.hardware.drm@1.0-adapter_genc++"],
-}