Merge "gs101: exclude telephony if BOARD_WITHOUT_RADIO is true" into sc-dev am: 11c87a5851
Original change: https://googleplex-android-review.googlesource.com/c/device/google/gs101/+/13845147 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2f4a1977614560d5e96f2834100b047d5270e319
This commit is contained in:
commit
4686091f71
1 changed files with 4 additions and 0 deletions
|
@ -897,7 +897,11 @@ USE_RADIO_HAL_1_6 := true
|
||||||
|
|
||||||
#$(call inherit-product, vendor/google_devices/telephony/common/device-vendor.mk)
|
#$(call inherit-product, vendor/google_devices/telephony/common/device-vendor.mk)
|
||||||
#$(call inherit-product, vendor/google_devices/gs101/proprietary/device-vendor.mk)
|
#$(call inherit-product, vendor/google_devices/gs101/proprietary/device-vendor.mk)
|
||||||
|
|
||||||
|
ifneq ($(BOARD_WITHOUT_RADIO),true)
|
||||||
$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/common/device-vendor.mk)
|
$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/common/device-vendor.mk)
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq (,$(filter %_64,$(TARGET_PRODUCT)))
|
ifeq (,$(filter %_64,$(TARGET_PRODUCT)))
|
||||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
||||||
else
|
else
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue