diff options
| -rw-r--r-- | BoardConfigICE.mk | 7 | ||||
| -rw-r--r-- | aosp_common.mk | 4 | ||||
| -rw-r--r-- | device.mk | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/BoardConfigICE.mk b/BoardConfigICE.mk index 1a54404a..a54e8564 100644 --- a/BoardConfigICE.mk +++ b/BoardConfigICE.mk @@ -7,9 +7,10 @@ BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true # Manifests -DEVICE_MANIFEST_FILE += \ - device/google/gs201/android.hardware.security.rkp-service.citadel.xml \ - device/google/gs201/manifest_radio_ds.xml +DEVICE_MANIFEST_FILE += device/google/gs201/android.hardware.security.rkp-service.citadel.xml +ifneq ($(BOARD_WITHOUT_RADIO),true) +DEVICE_MANIFEST_FILE += device/google/gs201/manifest_radio_ds.xml +endif # Partitions AB_OTA_PARTITIONS += \ diff --git a/aosp_common.mk b/aosp_common.mk index 30d037c5..87243925 100644 --- a/aosp_common.mk +++ b/aosp_common.mk @@ -27,7 +27,9 @@ PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed # All components inherited here go to system_ext image # $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk) +ifneq ($(BOARD_WITHOUT_RADIO),true) $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk) +endif # # All components inherited here go to product image @@ -39,7 +41,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) # # TODO(b/136525499): move *_vendor.mk into the vendor makefile later $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk) +ifneq ($(BOARD_WITHOUT_RADIO),true) $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk) +endif #$(call inherit-product, device/google/gs201/device.mk) #$(call inherit-product-if-exists, vendor/google_devices/gs201/proprietary/device-vendor.mk) @@ -117,8 +117,10 @@ PRODUCT_PRODUCT_PROPERTIES += \ persist.radio.reboot_on_modem_change=false # Configure DSDS by default +ifneq ($(BOARD_WITHOUT_RADIO),true) PRODUCT_PRODUCT_PROPERTIES += \ persist.radio.multisim.config=dsds +endif # Enable Early Camping PRODUCT_PRODUCT_PROPERTIES += \ |