Merge "Always include camera calibration tools in debug builds." into main

This commit is contained in:
Treehugger Robot 2024-12-05 23:13:29 +00:00 committed by Android (Google) Code Review
commit 2021b27dcc

View file

@ -49,10 +49,6 @@ PRODUCT_SOONG_NAMESPACES += \
vendor/google/camera/google_3a/libs_v4/gAF \ vendor/google/camera/google_3a/libs_v4/gAF \
vendor/google/camera/google_3a/libs_v4/gafd \ vendor/google/camera/google_3a/libs_v4/gafd \
vendor/google/camera/google_3a/libs_v4/gHAWB/native_coverage vendor/google/camera/google_3a/libs_v4/gHAWB/native_coverage
# Calibration tool for debug builds
PRODUCT_PACKAGES_DEBUG += tarasque_test
PRODUCT_PACKAGES_DEBUG += ProtoCalibGenerator
endif # BUILD_LYRIC_FROM_SOURCE endif # BUILD_LYRIC_FROM_SOURCE
# Init-time log settings for Google 3A # Init-time log settings for Google 3A
@ -73,3 +69,7 @@ DEVICE_MATRIX_FILE += \
# sepolicy dir is added in dump.mk. # sepolicy dir is added in dump.mk.
# Make doesn't deduplicate sepolicy dirs, so including it here causes build errors. # Make doesn't deduplicate sepolicy dirs, so including it here causes build errors.
# Calibration tools for debug builds
PRODUCT_PACKAGES_DEBUG += tarasque_test
PRODUCT_PACKAGES_DEBUG += ProtoCalibGenerator