Camera: Add support for HAL-versioned enum values
- Add hal_version to enum value fields as well, and add it to various doc outputs
- Improve HIDL metadata generation to work better with hidl-doc, and properly handle
enum value additions in new hal versions
- Enable HIDL HAL 3.3 output
Test: Builds, hidl-gen/hidl-doc are happy with the HIDL output
Bug: 63629224
Change-Id: I64b31d9e8e6eda41268df0fc95962b52fcce7fee
diff --git a/camera/docs/metadata-generate b/camera/docs/metadata-generate
index 58b5565..6999da9 100755
--- a/camera/docs/metadata-generate
+++ b/camera/docs/metadata-generate
@@ -202,9 +202,8 @@
# Generate HIDL metadata modules - new versions need to be added here manually
mkdir -p "${hidldir}/3.2"
gen_file_abs HidlMetadata.mako "$hidldir/3.2/types.hal" yes 3.2 || exit 1
-# Uncomment below to generate 3.3 HIDL module
-#mkdir -p "${hidldir}/3.3"
-#gen_file_abs HidlMetadata.mako "$hidldir/3.3/types.hal" yes 3.3 || exit 1
+mkdir -p "${hidldir}/3.3"
+gen_file_abs HidlMetadata.mako "$hidldir/3.3/types.hal" yes 3.3 || exit 1
#Generate NDK header
gen_file_abs ndk_camera_metadata_tags.mako "$ndk_header_dir/NdkCameraMetadataTags.h" yes || exit 1