Merge "Optional building Vendor Telephony proprietary by flag" into main

This commit is contained in:
Treehugger Robot 2024-08-14 06:27:49 +00:00 committed by Android (Google) Code Review
commit b552e4a56a
2 changed files with 4 additions and 0 deletions

View file

@ -14,7 +14,9 @@
# limitations under the License.
#
ifneq ($(BOARD_WITHOUT_RADIO), true)
-include vendor/google_devices/zumapro/proprietary/telephony/device-vendor.mk
endif
include device/google/zumapro/device.mk
# Telephony

View file

@ -96,8 +96,10 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
ro.oem_unlock_supported=1
# Include vendor telephony soong namespace
ifneq ($(BOARD_WITHOUT_RADIO), true)
PRODUCT_SOONG_NAMESPACES += \
vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)
endif
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
#Set IKE logs to verbose for WFC