From 29b454da85bb6d380fe825e43daa6f0cf767f33b Mon Sep 17 00:00:00 2001 From: Baligh Uddin Date: Tue, 13 Aug 2024 14:47:50 +0000 Subject: [PATCH] Use Build-Time flag to choose build from source or use prebuilt BUG: 358627252 Test: Local build + TH Change-Id: I4ef22dbe357bb04876e459061a694bfb146ae6e3 Flag: build.RELEASE_PIXEL_CAMERA_ENABLE_PREBUILT --- camera/lyric.mk | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/camera/lyric.mk b/camera/lyric.mk index 30e06d1..c886138 100644 --- a/camera/lyric.mk +++ b/camera/lyric.mk @@ -14,8 +14,13 @@ ifneq ($(wildcard vendor/google/services/LyricCameraHAL/src),) $(call soong_config_set,gch,hwl_library,lyric) endif -# Check if we're in the internal build -ifneq ($(wildcard vendor/google/camera),) +# Use build-time flag to select whether to build from source +# or ingest prebuilt-apex. We would want the development teams +# using release configuration: (trunk-staging) to build from source. +# All shipping releases will switch to prebuilts (trunk+) +# if this condition is not true, then build from source. + +ifneq ($(RELEASE_PIXEL_CAMERA_ENABLE_PREBUILT),true) PRODUCT_SOONG_NAMESPACES += \ vendor/google/camera \ @@ -36,8 +41,7 @@ PRODUCT_SOONG_NAMESPACES += \ # Calibration tool for debug builds PRODUCT_PACKAGES_DEBUG += tarasque_test PRODUCT_PACKAGES_DEBUG += ProtoCalibGenerator - -endif # vendor/google/camera check +endif # RELEASE_PIXEL_CAMERA_ENABLE_PREBUILT check # Init-time log settings for Google 3A PRODUCT_PACKAGES += libg3a_standalone_gabc_rc