Updating makefiles for hidl_interface.
Bug: 64487114
Test: manual
Merged-In: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
Change-Id: Ie13d9e014cf2b81c18c67f551b4644fb9f0ba812
diff --git a/camera/device/1.0/Android.bp b/camera/device/1.0/Android.bp
index f19aae9..dbf2a10 100644
--- a/camera/device/1.0/Android.bp
+++ b/camera/device/1.0/Android.bp
@@ -1,173 +1,34 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hardware.camera.device@1.0_hal",
+hidl_interface {
+ name: "android.hardware.camera.device@1.0",
+ root: "android.hardware",
+ vndk: {
+ enabled: true,
+ },
srcs: [
"types.hal",
"ICameraDevice.hal",
"ICameraDeviceCallback.hal",
"ICameraDevicePreviewCallback.hal",
],
-}
-
-genrule {
- name: "android.hardware.camera.device@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.camera.device@1.0",
- srcs: [
- ":android.hardware.camera.device@1.0_hal",
- ],
- out: [
- "android/hardware/camera/device/1.0/types.cpp",
- "android/hardware/camera/device/1.0/CameraDeviceAll.cpp",
- "android/hardware/camera/device/1.0/CameraDeviceCallbackAll.cpp",
- "android/hardware/camera/device/1.0/CameraDevicePreviewCallbackAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.camera.device@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.camera.device@1.0",
- srcs: [
- ":android.hardware.camera.device@1.0_hal",
- ],
- 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",
- "android/hardware/camera/device/1.0/BpHwCameraDevice.h",
- "android/hardware/camera/device/1.0/BsCameraDevice.h",
- "android/hardware/camera/device/1.0/ICameraDeviceCallback.h",
- "android/hardware/camera/device/1.0/IHwCameraDeviceCallback.h",
- "android/hardware/camera/device/1.0/BnHwCameraDeviceCallback.h",
- "android/hardware/camera/device/1.0/BpHwCameraDeviceCallback.h",
- "android/hardware/camera/device/1.0/BsCameraDeviceCallback.h",
- "android/hardware/camera/device/1.0/ICameraDevicePreviewCallback.h",
- "android/hardware/camera/device/1.0/IHwCameraDevicePreviewCallback.h",
- "android/hardware/camera/device/1.0/BnHwCameraDevicePreviewCallback.h",
- "android/hardware/camera/device/1.0/BpHwCameraDevicePreviewCallback.h",
- "android/hardware/camera/device/1.0/BsCameraDevicePreviewCallback.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.camera.device@1.0",
- defaults: ["hidl-module-defaults"],
- 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,
- vndk: {
- enabled: true,
- },
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
+ interfaces: [
"android.hardware.camera.common@1.0",
"android.hardware.graphics.common@1.0",
+ "android.hidl.base@1.0",
],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hardware.camera.common@1.0",
- "android.hardware.graphics.common@1.0",
+ types: [
+ "CameraFace",
+ "CameraFacing",
+ "CameraFrameMetadata",
+ "CameraInfo",
+ "CommandType",
+ "DataCallbackMsg",
+ "FrameCallbackFlag",
+ "HandleTimestampMessage",
+ "NotifyCallbackMsg",
+ "VideoFrameMessage",
],
+ gen_java: false,
}
-// 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.camera.device@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.camera.device@1.0",
- srcs: [
- ":android.hardware.camera.device@1.0_hal",
- ],
- out: [
- "android/hardware/camera/device/1.0/ACameraDevice.cpp",
- "android/hardware/camera/device/1.0/ACameraDeviceCallback.cpp",
- "android/hardware/camera/device/1.0/ACameraDevicePreviewCallback.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.camera.device@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.camera.device@1.0",
- srcs: [
- ":android.hardware.camera.device@1.0_hal",
- ],
- out: [
- "android/hardware/camera/device/1.0/ACameraDevice.h",
- "android/hardware/camera/device/1.0/ACameraDeviceCallback.h",
- "android/hardware/camera/device/1.0/ACameraDevicePreviewCallback.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.camera.device@1.0-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.camera.device@1.0-adapter-helper_genc++"],
- generated_headers: ["android.hardware.camera.device@1.0-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.hardware.camera.device@1.0-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.hardware.camera.common@1.0",
- "android.hardware.camera.device@1.0",
- "android.hardware.graphics.common@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.hardware.camera.common@1.0",
- "android.hardware.camera.device@1.0",
- "android.hardware.graphics.common@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.hardware.camera.device@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.camera.device@1.0",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.hardware.camera.device@1.0-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.hardware.camera.common@1.0",
- "android.hardware.camera.device@1.0",
- "android.hardware.graphics.common@1.0",
- "android.hardware.camera.device@1.0-adapter-helper",
- ],
- generated_sources: ["android.hardware.camera.device@1.0-adapter_genc++"],
-}
diff --git a/camera/device/3.2/Android.bp b/camera/device/3.2/Android.bp
index 0dcbdb4..a8a164e 100644
--- a/camera/device/3.2/Android.bp
+++ b/camera/device/3.2/Android.bp
@@ -1,173 +1,44 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hardware.camera.device@3.2_hal",
+hidl_interface {
+ name: "android.hardware.camera.device@3.2",
+ root: "android.hardware",
+ vndk: {
+ enabled: true,
+ },
srcs: [
"types.hal",
"ICameraDevice.hal",
"ICameraDeviceCallback.hal",
"ICameraDeviceSession.hal",
],
-}
-
-genrule {
- name: "android.hardware.camera.device@3.2_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.2",
- srcs: [
- ":android.hardware.camera.device@3.2_hal",
- ],
- out: [
- "android/hardware/camera/device/3.2/types.cpp",
- "android/hardware/camera/device/3.2/CameraDeviceAll.cpp",
- "android/hardware/camera/device/3.2/CameraDeviceCallbackAll.cpp",
- "android/hardware/camera/device/3.2/CameraDeviceSessionAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.camera.device@3.2_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.2",
- srcs: [
- ":android.hardware.camera.device@3.2_hal",
- ],
- 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",
- "android/hardware/camera/device/3.2/BpHwCameraDevice.h",
- "android/hardware/camera/device/3.2/BsCameraDevice.h",
- "android/hardware/camera/device/3.2/ICameraDeviceCallback.h",
- "android/hardware/camera/device/3.2/IHwCameraDeviceCallback.h",
- "android/hardware/camera/device/3.2/BnHwCameraDeviceCallback.h",
- "android/hardware/camera/device/3.2/BpHwCameraDeviceCallback.h",
- "android/hardware/camera/device/3.2/BsCameraDeviceCallback.h",
- "android/hardware/camera/device/3.2/ICameraDeviceSession.h",
- "android/hardware/camera/device/3.2/IHwCameraDeviceSession.h",
- "android/hardware/camera/device/3.2/BnHwCameraDeviceSession.h",
- "android/hardware/camera/device/3.2/BpHwCameraDeviceSession.h",
- "android/hardware/camera/device/3.2/BsCameraDeviceSession.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.camera.device@3.2",
- defaults: ["hidl-module-defaults"],
- 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,
- vndk: {
- enabled: true,
- },
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
+ interfaces: [
"android.hardware.camera.common@1.0",
"android.hardware.graphics.common@1.0",
+ "android.hidl.base@1.0",
],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hardware.camera.common@1.0",
- "android.hardware.graphics.common@1.0",
+ types: [
+ "BufferCache",
+ "BufferStatus",
+ "CameraBlob",
+ "CameraBlobId",
+ "CaptureRequest",
+ "CaptureResult",
+ "ErrorCode",
+ "ErrorMsg",
+ "HalStream",
+ "HalStreamConfiguration",
+ "MsgType",
+ "NotifyMsg",
+ "RequestTemplate",
+ "ShutterMsg",
+ "Stream",
+ "StreamBuffer",
+ "StreamConfiguration",
+ "StreamConfigurationMode",
+ "StreamRotation",
+ "StreamType",
],
+ gen_java: false,
}
-// 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.camera.device@3.2-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.camera.device@3.2",
- srcs: [
- ":android.hardware.camera.device@3.2_hal",
- ],
- out: [
- "android/hardware/camera/device/3.2/ACameraDevice.cpp",
- "android/hardware/camera/device/3.2/ACameraDeviceCallback.cpp",
- "android/hardware/camera/device/3.2/ACameraDeviceSession.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.camera.device@3.2-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.camera.device@3.2",
- srcs: [
- ":android.hardware.camera.device@3.2_hal",
- ],
- out: [
- "android/hardware/camera/device/3.2/ACameraDevice.h",
- "android/hardware/camera/device/3.2/ACameraDeviceCallback.h",
- "android/hardware/camera/device/3.2/ACameraDeviceSession.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.camera.device@3.2-adapter-helper",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.camera.device@3.2-adapter-helper_genc++"],
- generated_headers: ["android.hardware.camera.device@3.2-adapter-helper_genc++_headers"],
- export_generated_headers: ["android.hardware.camera.device@3.2-adapter-helper_genc++_headers"],
- vendor_available: true,
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
- "libhidladapter",
- "android.hardware.camera.common@1.0",
- "android.hardware.camera.device@3.2",
- "android.hardware.graphics.common@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "libhidladapter",
- "android.hardware.camera.common@1.0",
- "android.hardware.camera.device@3.2",
- "android.hardware.graphics.common@1.0",
- "android.hidl.base@1.0-adapter-helper",
- ],
-}
-
-genrule {
- name: "android.hardware.camera.device@3.2-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.camera.device@3.2",
- out: ["main.cpp"]
-}
-
-cc_test {
- name: "android.hardware.camera.device@3.2-adapter",
- defaults: ["hidl-module-defaults"],
- shared_libs: [
- "libhidladapter",
- "libhidlbase",
- "libhidltransport",
- "libutils",
- "android.hardware.camera.common@1.0",
- "android.hardware.camera.device@3.2",
- "android.hardware.graphics.common@1.0",
- "android.hardware.camera.device@3.2-adapter-helper",
- ],
- generated_sources: ["android.hardware.camera.device@3.2-adapter_genc++"],
-}
diff --git a/camera/device/3.3/Android.bp b/camera/device/3.3/Android.bp
index 2a19991..f006f79 100644
--- a/camera/device/3.3/Android.bp
+++ b/camera/device/3.3/Android.bp
@@ -1,72 +1,25 @@
-// This file is autogenerated by hidl-gen. Do not edit manually.
+// This file is autogenerated by hidl-gen -Landroidbp.
-filegroup {
- name: "android.hardware.camera.device@3.3_hal",
+hidl_interface {
+ name: "android.hardware.camera.device@3.3",
+ root: "android.hardware",
+ vndk: {
+ enabled: true,
+ },
srcs: [
"types.hal",
"ICameraDeviceSession.hal",
],
-}
-
-genrule {
- name: "android.hardware.camera.device@3.3_genc++",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-sources -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.3",
- srcs: [
- ":android.hardware.camera.device@3.3_hal",
- ],
- out: [
- "android/hardware/camera/device/3.3/types.cpp",
- "android/hardware/camera/device/3.3/CameraDeviceSessionAll.cpp",
- ],
-}
-
-genrule {
- name: "android.hardware.camera.device@3.3_genc++_headers",
- tools: ["hidl-gen"],
- cmd: "$(location hidl-gen) -o $(genDir) -Lc++-headers -randroid.hardware:hardware/interfaces -randroid.hidl:system/libhidl/transport android.hardware.camera.device@3.3",
- srcs: [
- ":android.hardware.camera.device@3.3_hal",
- ],
- out: [
- "android/hardware/camera/device/3.3/types.h",
- "android/hardware/camera/device/3.3/hwtypes.h",
- "android/hardware/camera/device/3.3/ICameraDeviceSession.h",
- "android/hardware/camera/device/3.3/IHwCameraDeviceSession.h",
- "android/hardware/camera/device/3.3/BnHwCameraDeviceSession.h",
- "android/hardware/camera/device/3.3/BpHwCameraDeviceSession.h",
- "android/hardware/camera/device/3.3/BsCameraDeviceSession.h",
- ],
-}
-
-cc_library {
- name: "android.hardware.camera.device@3.3",
- defaults: ["hidl-module-defaults"],
- generated_sources: ["android.hardware.camera.device@3.3_genc++"],
- generated_headers: ["android.hardware.camera.device@3.3_genc++_headers"],
- export_generated_headers: ["android.hardware.camera.device@3.3_genc++_headers"],
- vendor_available: true,
- vndk: {
- enabled: true,
- },
- shared_libs: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "liblog",
- "libutils",
- "libcutils",
+ interfaces: [
"android.hardware.camera.common@1.0",
"android.hardware.camera.device@3.2",
"android.hardware.graphics.common@1.0",
+ "android.hidl.base@1.0",
],
- export_shared_lib_headers: [
- "libhidlbase",
- "libhidltransport",
- "libhwbinder",
- "libutils",
- "android.hardware.camera.common@1.0",
- "android.hardware.camera.device@3.2",
- "android.hardware.graphics.common@1.0",
+ types: [
+ "HalStream",
+ "HalStreamConfiguration",
],
+ gen_java: false,
}
+