From 5b7f64590061e80911d4a2e933ce2867ca512aad Mon Sep 17 00:00:00 2001 From: audreyhung Date: Thu, 11 Mar 2021 19:06:11 +0800 Subject: [PATCH] Add variables in google3a_config for camera tuning 1. Add target_device into SOONG_CONFIG_NAMESPACES += google3a_config for saperating projects (raven, oriole, slider) 2. Add conditional switch for aosp and others of TARGET_PRODUCT. 3. Pass all forrest builds under git_sc-dev with 293c2c7462: Add variables in google3a_config for camera tuning 7fd2d5a87c: Revert "Revert "Separate project-wise tuning folders for 3A"" Tag: All build test 47 build(s): 0 failed. 47 passed. https://android-build.googleplex.com/builds/forrest/run/L45900000832571732 Bug: 177041310 Test: build pass, manually test on O6 Change-Id: I848a2702cecf1a35971ae5cba5ea83d4f6d65c1a --- device.mk | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/device.mk b/device.mk index 6278c552..23049edc 100644 --- a/device.mk +++ b/device.mk @@ -461,6 +461,16 @@ PRODUCT_PACKAGES += \ android.hardware.drm@1.4-service.widevine \ liboemcrypto \ +ORIOLE_PRODUCT := %oriole +RAVEN_PRODUCT := %raven +ifneq (,$(filter $(ORIOLE_PRODUCT), $(TARGET_PRODUCT))) + LOCAL_TARGET_PRODUCT := oriole +else ifneq (,$(filter $(RAVEN_PRODUCT), $(TARGET_PRODUCT))) + LOCAL_TARGET_PRODUCT := raven +else + LOCAL_TARGET_PRODUCT := slider +endif + SOONG_CONFIG_NAMESPACES += lyric SOONG_CONFIG_lyric += \ soc \ @@ -474,10 +484,13 @@ SOONG_CONFIG_google3a_config += \ soc \ gcam_awb \ ghawb_truetone \ + target_device \ SOONG_CONFIG_google3a_config_soc := gs101 SOONG_CONFIG_google3a_config_gcam_awb := true SOONG_CONFIG_google3a_config_ghawb_truetone := true +SOONG_CONFIG_google3a_config_target_device := $(LOCAL_TARGET_PRODUCT) + SOONG_CONFIG_NAMESPACES += gch SOONG_CONFIG_gch += \