Camera: codegen CameraDeviceInfo collection

Bug: 25983832
Change-Id: Ib84816a0e46c9d03bfb30474b6cbe5161290f015
diff --git a/camera/docs/metadata-generate b/camera/docs/metadata-generate
index 6009c40..39020c3 100755
--- a/camera/docs/metadata-generate
+++ b/camera/docs/metadata-generate
@@ -40,6 +40,8 @@
 outdir="$ANDROID_PRODUCT_OUT/obj/ETC/system-media-camera-docs_intermediates"
 ndk_header_dir="$ANDROID_BUILD_TOP/frameworks/av/include/camera/ndk"
 ndk_impl_dir="$ANDROID_BUILD_TOP/frameworks/av/camera/ndk/impl"
+device_info_dir="$ANDROID_BUILD_TOP/cts/common/device-side/device-info/"`
+        `"src/com/android/compatibility/common/deviceinfo"
 out_files=()
 
 function relpath() {
@@ -203,18 +205,27 @@
 gen_file_abs CameraCharacteristicsKeys.mako "$outdir/CameraCharacteristicsKeys.java.part" no || exit 1
 gen_file_abs CaptureRequestKeys.mako "$outdir/CaptureRequestKeys.java.part" no || exit 1
 gen_file_abs CaptureResultKeys.mako "$outdir/CaptureResultKeys.java.part" no || exit 1
-gen_file_abs CaptureResultTest.mako "$outdir/CaptureResultTest.java.part" no || exit 1
 
 insert_file "$outdir/CameraMetadataEnums.java.part" "$fwkdir/CameraMetadata.java" || exit 1
 insert_file "$outdir/CameraCharacteristicsKeys.java.part" "$fwkdir/CameraCharacteristics.java" || exit 1
 insert_file "$outdir/CaptureRequestKeys.java.part" "$fwkdir/CaptureRequest.java" || exit 1
 insert_file "$outdir/CaptureResultKeys.java.part" "$fwkdir/CaptureResult.java" || exit 1
+
+# Generate CTS test code
+gen_file_abs CaptureResultTest.mako "$outdir/CaptureResultTest.java.part" no || exit 1
 insert_file "$outdir/CaptureResultTest.java.part" "$ctsdir/CaptureResultTest.java" || exit 1
 
 # Generate NDK implementation
 gen_file_abs ACameraMetadata.mako "$outdir/ACameraMetadata.cpp.part" no || exit 1
 insert_file "$outdir/ACameraMetadata.cpp.part" "$ndk_impl_dir/ACameraMetadata.cpp" || exit 1
 
+# Generate CameraDeviceInfo code
+gen_file_abs CameraDeviceInfo.mako "$outdir/CameraDeviceInfo.java.part" no || exit 1
+insert_file "$outdir/CameraDeviceInfo.java.part" "$device_info_dir/CameraDeviceInfo.java" || exit 1
+
+# Generate protocol buffer definition corresponding to CameraDeviceInfo
+gen_file camera_device_info.mako ./camera_device_info.proto || exit 1
+
 # Copy ./images directory into javadoc directory
 copy_directory "images" "$fwkdir_html" || exit 1