Evolution-X-Tensor/device_google_gs101
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gs101: exclude vendor telephony code if BOARD_WITHOUT_RADIO am: d8610a1415

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/19446318

Change-Id: Ide854415237452b38972b5daf427d1be09cb6fc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Roger Liao 2022-07-29 06:57:24 +00:00 • committed by Automerger Merge Worker
commit 443f531b4e
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
device-common.mk
View file

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

6
device.mk
View file

@ -66,9 +66,11 @@ LOCAL_KERNEL := $(TARGET_KERNEL_DIR)/Image.lz4
PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
ro.oem_unlock_supported=1 ro.oem_unlock_supported=1
ifneq ($(BOARD_WITHOUT_RADIO),true)
# Include vendor telephony soong namespace # Include vendor telephony soong namespace
PRODUCT_SOONG_NAMESPACES += \ PRODUCT_SOONG_NAMESPACES += \
vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY) vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)
endif
ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT))) ifneq (,$(filter userdebug eng, $(TARGET_BUILD_VARIANT)))
#Set IKE logs to verbose for WFC #Set IKE logs to verbose for WFC
@ -898,6 +900,7 @@ PRODUCT_PACKAGES += \
calliope_iva.bin \ calliope_iva.bin \
vts.bin vts.bin
ifneq ($(BOARD_WITHOUT_RADIO),true)
# This will be called only if IMSService is building with source code for dev branches. # This will be called only if IMSService is building with source code for dev branches.
$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/shannon-ims/device-vendor.mk) $(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/shannon-ims/device-vendor.mk)
@ -910,6 +913,7 @@ PRODUCT_PACKAGES_DEBUG += \
TestRcsApp TestRcsApp
PRODUCT_PACKAGES += ShannonRcs PRODUCT_PACKAGES += ShannonRcs
endif
# Boot Control HAL # Boot Control HAL
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@ -1164,8 +1168,10 @@ include hardware/google/pixel/common/pixel-common-device.mk
# Pixel Logger # Pixel Logger
include hardware/google/pixel/PixelLogger/PixelLogger.mk include hardware/google/pixel/PixelLogger/PixelLogger.mk
ifneq ($(BOARD_WITHOUT_RADIO),true)
# Telephony # Telephony
include device/google/gs101/telephony/user.mk include device/google/gs101/telephony/user.mk
endif
# Wifi ext # Wifi ext
include hardware/google/pixel/wifi_ext/device.mk include hardware/google/pixel/wifi_ext/device.mk