From 29b454da85bb6d380fe825e43daa6f0cf767f33b Mon Sep 17 00:00:00 2001
From: Baligh Uddin <baligh@google.com>
Date: Tue, 13 Aug 2024 14:47:50 +0000
Subject: [PATCH 1/2] 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

From 6d8cc33ddeeec518b7c99b20b86a2a42ddeb7273 Mon Sep 17 00:00:00 2001
From: Devika Krishnadas <kdevika@google.com>
Date: Tue, 23 Jul 2024 21:11:26 +0000
Subject: [PATCH 2/2] Rename arm-gralloc namespace to pixel-gralloc for
 mapper-version

Bug: 355046697
Test: Build and boot
Change-Id: Ic4e7bf898aec3bf37fe3b46d5109d06f86b13646
Signed-off-by: Devika Krishnadas <kdevika@google.com>
---
 gpu/gpu.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gpu/gpu.mk b/gpu/gpu.mk
index b87e7ad..0dd50e5 100644
--- a/gpu/gpu.mk
+++ b/gpu/gpu.mk
@@ -8,9 +8,9 @@ PRODUCT_PACKAGES += pixel_gralloc_allocator
 PRODUCT_PACKAGES += pixel_gralloc_mapper
 
 ifeq ($(USE_MAPPER5), true)
-$(call soong_config_set,arm_gralloc,mapper_version,mapper5)
+$(call soong_config_set,pixel_gralloc,mapper_version,mapper5)
 $(call soong_config_set,aion_buffer,mapper_version,mapper5)
 else
-$(call soong_config_set,arm_gralloc,mapper_version,mapper4)
+$(call soong_config_set,pixel_gralloc,mapper_version,mapper4)
 $(call soong_config_set,aion_buffer,mapper_version,mapper4)
 endif