Camera: Fix up metadata generation, including HIDL gen
- Merge NDK and SDK metadata definitions back together
- Add special linkify handling for SDK/NDK alternate names
- Add ndk/sdk specific notes/details tags
- Use new tags/link format to merge ndk_metadata_properties docs
into metadata_properties
- Rename metadata_properties to metadata_definitions for clarity
- Move SDK reference images to /reference/images/camera2/...
- Add HIDL metadata HAL field to entries, defaulting to 3.2
- Output HAL version into docs.html and camera_metadata_tags.h
Outputting new HIDL module defintions for new metadata versions will
be in a later CL.
Bug: 29102963
Bug: 33262893
Test: Builds, manual inspection of resulting generated files
Change-Id: Ib61111ebf3a068fe62b7a3305b6ab462619c39bb
diff --git a/camera/docs/metadata-generate b/camera/docs/metadata-generate
index 4912421..27c7811 100755
--- a/camera/docs/metadata-generate
+++ b/camera/docs/metadata-generate
@@ -35,7 +35,7 @@
thisdir=$(cd "$(dirname "$0")"; pwd)
fwkdir="$ANDROID_BUILD_TOP/frameworks/base/core/java/android/hardware/camera2/"
-fwkdir_html="$ANDROID_BUILD_TOP/frameworks/base/docs/html"
+fwkdir_html="$ANDROID_BUILD_TOP/frameworks/base/docs/html/reference"
ctsdir="$ANDROID_BUILD_TOP/cts/tests/camera/src/android/hardware/camera2/cts"
outdir="$ANDROID_PRODUCT_OUT/obj/ETC/system-media-camera-docs_intermediates"
ndk_header_dir="$ANDROID_BUILD_TOP/frameworks/av/camera/ndk/include/camera"
@@ -61,12 +61,7 @@
local in="$1"
local out="$2"
local intermediates="$3"
- local ndk="$4"
- local spec_file=$thisdir/metadata_properties.xml
-
- if [[ "$ndk" == "yes" ]]; then
- spec_file=$thisdir/ndk_metadata_properties.xml
- fi
+ local spec_file=$thisdir/metadata_definitions.xml
python $thisdir/metadata_parser_xml.py $spec_file $in $out
@@ -192,7 +187,7 @@
}
$thisdir/metadata-check-dependencies || exit 1
-$thisdir/metadata-validate $thisdir/metadata_properties.xml || exit 1
+$thisdir/metadata-validate $thisdir/metadata_definitions.xml || exit 1
$thisdir/metadata-parser-sanity-check || exit 1
# Generate HTML properties documentation
@@ -203,7 +198,7 @@
gen_file camera_metadata_tags.mako ../include/system/camera_metadata_tags.h || exit 1
#Generate NDK header
-gen_file_abs ndk_camera_metadata_tags.mako "$ndk_header_dir/NdkCameraMetadataTags.h" yes yes || exit 1
+gen_file_abs ndk_camera_metadata_tags.mako "$ndk_header_dir/NdkCameraMetadataTags.h" yes || exit 1
# Generate Java API definitions
mkdir -p "${outdir}"