Always include camera calibration tools in debug builds.
These statements will be ignored if the packages are
unavailable, such as in the PDK build.
Bug: 380373922
Test: presubmit, check that tools exist in husky-userdebug
Flag: EXEMPT debug-only tool
Change-Id: Id3a524a6adaf1f719a23eb91ebad161ce0551af4
diff --git a/camera/lyric.mk b/camera/lyric.mk
index 0ec1d6d..adffb74 100644
--- a/camera/lyric.mk
+++ b/camera/lyric.mk
@@ -49,10 +49,6 @@
vendor/google/camera/google_3a/libs_v4/gAF \
vendor/google/camera/google_3a/libs_v4/gafd \
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
# Init-time log settings for Google 3A
@@ -73,3 +69,7 @@
# sepolicy dir is added in dump.mk.
# 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