From 103f3cad62a91a888f9bcfd7515f775b83ad7e2a Mon Sep 17 00:00:00 2001 From: Yuriy Romanenko Date: Thu, 20 May 2021 15:41:44 +0000 Subject: [PATCH] Revert "Update GCH configuration for gs101." Revert "Directly link Lyric into GCH." Revert "Adjust reference to libgoogle_camera_hal_tests." Revert "Only compile camera HAL tests for primary arch." Revert "Update commented-out GCH configuration for zebu201." Revert "Adjust reference to libgoogle_camera_hal_tests." Revert "Changes to support direct linking of Lyric into GCH." Revert "Update GCH configuration for coral." Revert submission 14596214-gch_dlopen Reason for revert: Breaks master-without-vendor because of hardware/google/camera -> vendor/google/services/LyricCameraHAL/src dependency that needs to be broken somehow. Bug: 188731034 Reverted Changes: I7f1780f25:Adjust reference to libgoogle_camera_hal_tests. Ief35ee657:Adjust reference to libgoogle_camera_hal_tests. I9070712e1:Update commented-out GCH configuration for zebu201... I33c989b24:Adjust reference to libgoogle_camera_hal_tests. I8250a5874:Update GCH configuration for coral. I76cb1957a:Adjust reference to libgoogle_camera_hal_tests. I628ac0367:Use a single toplevel library for Lyric. I647189d9f:Only compile camera HAL tests for primary arch. I72cf7918b:Changes to support direct linking of Lyric into GC... I556322b01:Update GCH configuration for gs101. I43f7f675e:Directly link Lyric into GCH. Change-Id: Ia72c97f4044ecac8bda438fdb917a978643cbbfe --- device.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/device.mk b/device.mk index 92801d25..632c47d9 100644 --- a/device.mk +++ b/device.mk @@ -471,9 +471,11 @@ 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 += hwl_library -SOONG_CONFIG_gch_hwl_library := lyric +SOONG_CONFIG_gch += feature +# Disable Legacy common hal modules for whi +SOONG_CONFIG_gch_feature := use_lyric_hal # WiFi PRODUCT_PACKAGES += \