commit 21d0f1a1e8ba54be661075fb771adca0177ce4bc
author Igor Murashkin <iam@google.com> Tue Sep 10 12:25:56 2013 -0700
committer Igor Murashkin <iam@google.com> Sat Sep 21 21:05:28 2013 -0700
tree 1c39e04e49a388a4729c82b55d6afad51e183284
parent 28548d2cc4415a51e70002d65ad9186d7c4fa8ee

camera_metadata: Rename CameraProperties to CameraCharacteristics

Bug: 10360518
Change-Id: Ib152a751fed07250c8f211b25469560ef05f1107

camera/docs/metadata-generate

diff --git a/camera/docs/metadata-generate b/camera/docs/metadata-generate
index 9b17b2c..85c1809 100755
--- a/camera/docs/metadata-generate
+++ b/camera/docs/metadata-generate
@@ -21,7 +21,10 @@
 #   docs.html
 #   ../src/camera_metadata_tag_info.c
 #   ../src/camera_metadata_tags.h
-#   ../../../../cts/tests/tests/hardware/src/android/hardware/camera2/cts/CameraPropertiesTest.java
+#   ../../../../cts/tests/tests/hardware/src/android/hardware/camera2/cts/CameraCharacteristicsTest.java
+#   ../../../../frameworks/base/core/java/android/hardware/camera2/CameraCharacteristics.java
+#   ../../../../frameworks/base/core/java/android/hardware/camera2/CaptureRequest.java
+#   ../../../../frameworks/base/core/java/android/hardware/camera2/CaptureResult.java
 
 if [[ -z $ANDROID_BUILD_TOP ]]; then
     echo "Please source build/envsetup.sh before running script" >& 2
@@ -163,17 +166,17 @@
 # Generate Java API definitions
 mkdir -p "${outdir}"
 gen_file_abs CameraMetadataEnums.mako "$outdir/CameraMetadataEnums.java.part" no || exit 1
-gen_file_abs CameraPropertiesKeys.mako "$outdir/CameraPropertiesKeys.java.part" no || exit 1
+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
 
 insert_file "$outdir/CameraMetadataEnums.java.part" "$fwkdir/CameraMetadata.java" || exit 1
-insert_file "$outdir/CameraPropertiesKeys.java.part" "$fwkdir/CameraProperties.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 tests
-gen_file_abs CameraPropertiesTest.mako "$ctsdir/CameraPropertiesTest.java" || exit 1
+gen_file_abs CameraCharacteristicsTest.mako "$ctsdir/CameraCharacteristicsTest.java" || exit 1
 
 echo ""
 echo "===================================================="